1

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositdescrController.java

@@ -53,7 +53,6 @@ public class BankDepositdescrController extends BaseController
     {
         startPage();
         List<BankDepositdescr> list = bankDepositdescrService.selectBankDepositdescrList(bankDepositdescr);
-<<<<<<< HEAD
 
         Long[] uids = list.stream().map(BankDepositdescr::getPpid).toArray(Long[]::new);
 
@@ -65,7 +64,6 @@ public class BankDepositdescrController extends BaseController
             }
         }
 
-=======
         for(BankDepositdescr item : list){
             if("3".equals(item.getRtnRfndst())){
                 item.setStatus("退款处理中");
@@ -77,7 +75,7 @@ public class BankDepositdescrController extends BaseController
                 item.setStatus("未申请退款");
             }
         }
->>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
+
         return getDataTable(list);
     }
 

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositController.java

@@ -47,15 +47,9 @@ public class BankUncleardepositController extends BaseController {
     @Autowired
     private BankUncleardepositrfndController bankUncleardepositrfndController;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
-<<<<<<< HEAD
-=======
     @Autowired
     private Environment env;
 
->>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
     /**
      * 查询查询不明保证金明细列表
      */
@@ -64,8 +58,7 @@ public class BankUncleardepositController extends BaseController {
     public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
         startPage();
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
-<<<<<<< HEAD
-=======
+
         for(BankUncleardeposit item : list){
             if(item.getRtnXferprccode() == null){
                 item.setStatus("未申请退款");
@@ -75,7 +68,6 @@ public class BankUncleardepositController extends BaseController {
                  item.setStatus("已申请");
             }
         }
->>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
         return getDataTable(list);
     }