Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

LiFei 4 lat temu
rodzic
commit
53cca10c80

+ 1 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwOrderApiController.java

@@ -314,6 +314,7 @@ public class HlwOrderApiController extends JeecgController<HlwOrder, IHlwOrderSe
                     hlwSubcontractor.setStartDate(hlwUserSubcontractor.getStartDate());
                     hlwSubcontractor.setEndDate(hlwUserSubcontractor.getEndDate());
                     hlwSubcontractor.setIsAutoRenew(hlwUserSubcontractor.getIsAutoRenew());
+                    hlwSubcontractor.setWorkContract(hlwUserSubcontractor.getWorkContract());
                     //判断合同是否过期或者即将过期
                     LocalDate startDate = DateUtils.asLocalDate(hlwSubcontractor.getStartDate());
                     LocalDate endDate = DateUtils.asLocalDate(hlwSubcontractor.getEndDate());