wangxianzhang
|
366c3d994c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform
|
3 years ago |
jianjun
|
cb2b4882d5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
2ab866188c
|
项目进展 同步显示
|
3 years ago |
yinzuomei
|
f9b5c74ddb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
b0db08200a
|
新增部门
|
3 years ago |
syc
|
9a4fa92cc2
|
Merge branch 'dev_project_hd_syc'
|
3 years ago |
|
syc
|
0c543dd1cc
|
应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
|
3 years ago |
|
syc
|
ac2792bb7f
|
Merge branch 'dev_project_hd_syc'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
3 years ago |
|
jianjun
|
6e808cf108
|
Merge remote-tracking branch 'remotes/origin/dev_project_process'
|
3 years ago |
zhaoqifeng
|
b89c1074f0
|
处理进展添加工作人员姓名
|
3 years ago |
|
zhaoqifeng
|
c0ce8983cb
|
处理进展添加工作人员姓名
|
3 years ago |
|
jianjun
|
2b213ad2a3
|
Merge remote-tracking branch 'remotes/origin/dev_project_process' into 市北master
|
3 years ago |
|
jianjun
|
937c1db3bc
|
Merge remote-tracking branch 'remotes/origin/dev_project_process'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
3 years ago |
|
syc
|
2c78a9e163
|
。
|
3 years ago |
|
zhaoqifeng
|
39ca2f2271
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
768d0a60b6
|
网格员统计修改
|
3 years ago |
|
syc
|
3042fc5cf7
|
。
|
3 years ago |
|
syc
|
02c8376402
|
。
|
3 years ago |
|
zhaoqifeng
|
cb37543287
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
c0a3010088
|
网格员统计修改
|
3 years ago |
|
syc
|
c9998ad0aa
|
bug修改
|
3 years ago |
|
syc
|
ff8c484bcd
|
增加返参
|
3 years ago |
|
yinzuomei
|
cb0fec563a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
1f9059e0d8
|
IcBulidingAddFormDTO.sort不判断孔了试试
|
3 years ago |
|
syc
|
c8f27c0d9a
|
程序调整
|
3 years ago |
|
wangxianzhang
|
a79b27db38
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
6b140198c9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
syc
|
ed589583bd
|
数字平台 项目管理列表、导出
|
3 years ago |
|
wangxianzhang
|
0bf2aebac4
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
wangxianzhang
|
255e6e1e97
|
【五大图层】企事业单位巡查，search条件没有判空
|
3 years ago |
|
syc
|
c72bd68047
|
数字平台 项目管理列表、导出
|
3 years ago |
|
syc
|
ee839d8a0c
|
数字平台 项目管理列表、导出
|
3 years ago |
|
syc
|
afedc08ea3
|
数字平台 项目管理列表、导出
|
3 years ago |
|
yinzuomei
|
9044cf996f
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
3 years ago |
|
yinzuomei
|
989416985e
|
try
|
3 years ago |
|
yinzuomei
|
b6ef693ba8
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
3 years ago |
|
yinzuomei
|
a0bb593b48
|
try
|
3 years ago |
|
jianjun
|
52120e1778
|
5
|
3 years ago |
|
jianjun
|
a19277f09a
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22'
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
3 years ago |
|
jianjun
|
4a09a0c2c9
|
Merge remote-tracking branch 'remotes/origin/dev_five_coverage'
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
|
3 years ago |
|
jianjun
|
78ea9c50cf
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
wangxianzhang
|
07504d21d5
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
wangxianzhang
|
6e05d0969c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
d3e93bfce4
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
wangxianzhang
|
615f8a8a6b
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
jianjun
|
99b60c7455
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
76b03dee54
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform into 市北master
|
3 years ago |
|
jianjun
|
47255dfe88
|
Merge remote-tracking branch 'remotes/origin/dev_bug_select_staff' into 市北master
|
3 years ago |
zxc
|
d230318120
|
emm
|
3 years ago |
|
wangxianzhang
|
4275d40cbc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
