Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractBorrowService.java

@@ -75,7 +75,7 @@ public class WorkContractBorrowService {
         workContractBorrowMapper.updateById(borrow);
         //借用记录信息
         this.saveMessage(workContractBorrowDto, workContractBorrowDto.getId());
-        return borrow.getContractInfoId();
+        return borrow.getId();
     }
 
     /**