合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.po.inspection.InspectionTaskDetailPo;
import com.java110.po.inspection.InspectionTaskPo;
import org.springframework.cloud.openfeign.FeignClient;