合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-community/src/main/java/com/java110/community/smo/impl/InspectionPlanStaffInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;