Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerAddParam.java

@@ -34,6 +34,6 @@ public class BorrowerAddParam {
     private String openBankId;
     @ApiModelProperty(value = "开户行", example = "宁波银行")
     @NotBlank(message = "开户行不能为空")
-    private String openBank;
+    private String openBankName;
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerUpdateParam.java

@@ -38,6 +38,6 @@ public class BorrowerUpdateParam {
     private String openBankId;
     @ApiModelProperty(value = "开户行", example = "宁波银行")
     @NotBlank(message = "开户行不能为空")
-    private String openBank;
+    private String openBankName;
 
 }

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/BorrowerVO.java

@@ -32,7 +32,7 @@ public class BorrowerVO {
     @ApiModelProperty(value = "开户行行号", example = "313332082914")
     private String openBankId;
     @ApiModelProperty(value = "开户行", example = "宁波银行")
-    private String openBank;
+    private String openBankName;
     @ApiModelProperty(value = "状态：1启用 2禁用", example = "1")
     private Integer status;
     @ApiModelProperty(value = "操作人编码", example = "1000000")

performance-web/src/main/java/com/clx/performance/dao/impl/loan/BorrowerDaoImpl.java

@@ -34,7 +34,7 @@ public class BorrowerDaoImpl extends BaseDaoImpl<BorrowerMapper, Borrower, Integ
                 .set(Borrower::getBankName, item.getBankName())
                 .set(Borrower::getBankCardNo, item.getBankCardNo())
                 .set(Borrower::getOpenBankId, item.getOpenBankId())
-                .set(Borrower::getOpenBank, item.getOpenBank())
+                .set(Borrower::getOpenBankName, item.getOpenBankName())
 
                 .set(Borrower::getOpUserNo, item.getOpUserNo())
                 .set(Borrower::getOpUserName, item.getOpUserName())

performance-web/src/main/java/com/clx/performance/model/loan/Borrower.java

@@ -30,7 +30,7 @@ public class Borrower implements HasKey<Integer> {
     private String bankName;                        //所属银行
     private String bankCardNo;                      //银行账号
     private String openBankId;                      //开户行行号
-    private String openBank;                        //开户行
+    private String openBankName;                    //开户行
     private Integer deleteStatus;                   //删除状态: 0-否;1-是
     private Integer status;                         //状态：1启用 2禁用
     private Long opUserNo;                          //操作人编码

performance-web/src/main/java/com/clx/performance/service/impl/loan/BorrowerServiceImpl.java

@@ -54,7 +54,7 @@ public class BorrowerServiceImpl implements BorrowerService {
         borrower.setBankName(param.getBankName());
         borrower.setBankCardNo(param.getBankCardNo());
         borrower.setOpenBankId(param.getOpenBankId());
-        borrower.setOpenBank(param.getOpenBank());
+        borrower.setOpenBankName(param.getOpenBankName());
 
         borrower.setOpUserNo(loginUserInfo.getUserNo());
         borrower.setOpUserName(loginUserInfo.getUserName());
@@ -79,7 +79,7 @@ public class BorrowerServiceImpl implements BorrowerService {
         borrower.setBankName(param.getBankName());
         borrower.setBankCardNo(param.getBankCardNo());
         borrower.setOpenBankId(param.getOpenBankId());
-        borrower.setOpenBank(param.getOpenBank());
+        borrower.setOpenBankName(param.getOpenBankName());
 
         borrower.setOpUserNo(loginUserInfo.getUserNo());
         borrower.setOpUserName(loginUserInfo.getUserName());