Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverDetailServiceImpl.java

@@ -130,6 +130,6 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         } else if (Objects.equals(loanFlag, OwnerLoanRecordEnum.LoanFlag.RE_PAY.getCode())) {
             return OwnerLoanRecordEnum.LoanFlag.RE_PAY.getMsg();
         }
-        return null;
+        return "无需借款";
     }
 }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverServiceImpl.java

@@ -86,6 +86,6 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
         } else if (Objects.equals(loanFlag, OwnerLoanRecordEnum.LoanFlag.RE_PAY.getCode())) {
             return OwnerLoanRecordEnum.LoanFlag.RE_PAY.getMsg();
         }
-        return null;
+        return "无需借款";
     }
 }