Merge branch 'feature/screenDataPush'

4 years ago · 012124c841
2 changed files with 738 additions and 632 deletions
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
 * 治理能力数据推送
 * 目前榆山和锦水属于街道，孔村属于区直部门，所以仅有孔村对区直部门做了额外处理
 *
 * @author zhy
 * @date 2021/6/28 11:07
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml