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

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

@@ -58,8 +58,8 @@ public enum OwnerLoanRecordEnum {
     @AllArgsConstructor
     public enum LoanFlag {
         NO_LOAN(0, "未借款"),
-        LOAN(2, "已借款"),
-        RE_PAY(3, "已还款"),
+        LOAN(1, "已借款"),
+        RE_PAY(2, "已还款"),
         ;
 
         private final Integer code;

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

@@ -101,7 +101,7 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
         } else {
             //审批拒绝
             update.setStatus(OwnerLoanAccountApproveEnum.Status.APPROVE_REFUSE.getCode());
-            entity.setRejectReason(param.getRejectReason());
+            update.setRejectReason(param.getRejectReason());
             ownerLoanAccountApproveDao.updateEntityByKey(update);
         }
     }