Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/resubmit/ResubmitInspectionService.java

@@ -198,7 +198,7 @@ public class ResubmitInspectionService {
             return JsonResult.error(ResubmitInspectionCodeEnum.DEPT_IS_NOT_EXIST.getCode(), ResubmitInspectionCodeEnum.DEPT_IS_NOT_EXIST.getMsg());
         }
         Inspection inspection = InspectionConverMapper.INSTANCE.fromEditInspectionRequestToInspection(request);
-        String code = DateUtils.generateCode("XJRW");
+        String code = DateUtils.generateCode("DCRW");
         inspection.setCode(code);
         inspection.setId("");
         inspection.setTenantId(tenantId);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/task/InspectionCycleTask.java

@@ -143,7 +143,8 @@ public class InspectionCycleTask {
         inspection.setInspectionTime(inspectionCycle.getCycleNextTime());
         inspection.setType(InspectionTaskTypeEnum.CYCLE_INSPECTION.getCode());
         inspection.setInspectionType(InspectionTypeEnum.AIRPORT.getCode());
-        inspection.setCreateUser("");
+        inspection.setCreateUser(inspectionCycle.getCreateUser());
+
         inspection.setCreateTime(DateUtils.now());
         inspection.setStatus(InspectionStatusEnum.WAIT_FLIGHT.getCode());
         Date cycleNextTime = InspectionCycleNextTimeUtil.getCycleNextTime(inspectionCycle.getType(),