Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountRunningWaterRecordEnum.java

@@ -16,7 +16,7 @@ public enum OwnerLoanAccountRunningWaterRecordEnum {
     public enum RunWaterType {
         APPROVE_WAIT(80, "借款"),
         APPROVE_FROZEN(90, "冻结"),
-        APPROVE_CHILD_WRITE_OFF(100, "运单核销"),
+        APPROVE_CHILD_WRITE_OFF(100, "运单抵扣"),
         APPROVE_THAW(110, "解冻"),
         ;
 

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

@@ -19,7 +19,7 @@ public class PageOwnerLoanAccountWaterRecordOfOwnerParam extends PageParam {
     private Long runningWaterNo;
     @ApiModelProperty(value = "运单编号", example = "10000")
     private String childNo;
-    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单核销 110:解冻", example = "10")
+    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单抵扣 110:解冻", example = "10")
     private Integer runningWaterType;
 
 }
\ No newline at end of file

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

@@ -39,9 +39,9 @@ public class OwnerLoanAccountRunningWaterRecordVO {
     private Long loanNo;
     @ApiModelProperty(value = "运单编号", example = "100000")
     private String childNo;
-    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单核销 110:解冻", example = "10")
+    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单抵扣 110:解冻", example = "10")
     private Integer runningWaterType;
-    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单核销 110:解冻", example = "10")
+    @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单抵扣 110:解冻", example = "10")
     private String runningWaterTypeMsg;
     public String getRunningWaterTypeMsg() {
         return OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.getMsgByCode(runningWaterType);