Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportDto.java
#	zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/other/WReportVo.java
#	zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/WReportController.java
#	zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/WReportServiceImpl.java

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/other/WReportBizService.java

@@ -9,6 +9,8 @@ import com.zfjg.manage.api.vo.other.WReportVo;
 
 import java.util.List;
 
+import java.util.List;
+
 public interface WReportBizService {
     /**
      * 新增过错信息