Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java

@@ -11,8 +11,7 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipExpenseListBinding;
-import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
-import com.xingdata.zzdpos.model.VipRechangeOrder;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
 import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
@@ -23,9 +22,9 @@ import java.util.List;
 /**
  * 会员消费记录
  */
-public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding> {
+public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding>  {
     private VipRechargeAdapter vipRechargeAdapter;
-    private List<VipRechangeOrder> orders = new ArrayList<>();
+    private List<VipRechargeOrder> orders = new ArrayList<>();
 
     @Override
     public int getLayoutId() {
@@ -42,7 +41,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
         mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
         vipRechargeAdapter.setEnableLoadMore(true);
         vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
-        mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
+        mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
             new VipEditMenuDialog().show((BaseActivity) getActivity());
         });
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
@@ -52,7 +51,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
     }
 
     private void onLoadMore() {
-        vipRechargeAdapter.addData(new VipRechangeOrder());
+        vipRechargeAdapter.addData(new VipRechargeOrder());
         vipRechargeAdapter.setEnableLoadMore(true);
         vipRechargeAdapter.loadMoreComplete();
         ToastUtils.showShort("刷新成功");