Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.biz.service.IDutyCarService;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.util.ArrayList;
@@ -74,6 +75,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
             DutyPersonShift dutyPersonShift = new DutyPersonShift();
             dto.setInstanceId(instanceId);
             Bean.copyExistPropertis(dto, dutyPersonShift);
+            dutyPersonShift.setAppKey(RequestContext.getAppKey());
             return dutyPersonShift;
         }).collect(Collectors.toSet());
         if (!personShiftList.isEmpty()) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java

@@ -87,6 +87,7 @@ public class DutyPersonServiceImpl extends DutyCommonServiceImpl implements IDut
             DutyPersonShift dutyPersonShift = new DutyPersonShift();
             dto.setInstanceId(instanceId);
             Bean.copyExistPropertis(dto, dutyPersonShift);
+            dutyPersonShift.setAppKey(RequestContext.getAppKey());
             return dutyPersonShift;
         }).collect(Collectors.toSet());
         if (!personShiftList.isEmpty()) {