fix : 解决冲突

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/TopEntrapmentActivity.java

@@ -413,7 +413,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
                 inputValue = FunHelper.getText(binding.etInputMoney);
             }
         });
-
+        
         //立即充值
         binding.nextStep.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -426,19 +426,11 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
                     toast("请输入充值金额，或者选择需要充值的金额！");
                     return;
                 }
-<<<<<<< HEAD
-//                if(Double.parseDouble(FunHelper.getText(binding.etInputMoney)) < 10){
-//                    toast("最低充值金额不小于10元!");
-//                    return;
-//                }
-                moneyInfo = new RechargeBean(FunHelper.getText(binding.etInputMoney));
-=======
 
                 if(Double.parseDouble(moneyInfo.payMoney) < 10){
                     toast("最低充值金额不小于10元!");
                     return;
                 }
->>>>>>> c03e8c06c8c823800a0c6457f50cebd8c5a105ff
                 doRecharge();
             }
         });