合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-api/src/main/java/com/java110/api/listener/inspectionTaskDetail/UpdateInspectionTaskDetailListener.java

@@ -13,8 +13,8 @@
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.entity.center.AppService;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.CommonConstant;