wangxianzhang
|
25a5fc3a7f
|
aggregator的partymember的数据源调整
|
3 years ago |
|
wangxianzhang
|
1bb1734c95
|
Merge branch 'dev_now_stats_syc' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
366c3d994c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform
|
3 years ago |
syc
|
b55f97f7cc
|
查询组织、网格改为查询实时数据，不在查询统计数据
|
3 years ago |
|
syc
|
86aea9aac3
|
项目流转(回复退回吹哨结案)时公开答复为必填项
|
3 years ago |
|
syc
|
98a0e4bc85
|
表中加字段设计旧程序赋值问题
|
3 years ago |
|
syc
|
f7772549f5
|
数据实时统计列表查询、导出初版
|
3 years ago |
jianjun
|
cb2b4882d5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
2ab866188c
|
项目进展 同步显示
|
3 years ago |
|
syc
|
8b482e436b
|
表增加字段
|
3 years ago |
zhangyuan
|
5845ebe6bb
|
Merge branch 'feature/visitor_zhy'
|
3 years ago |
zxc
|
1bed7d8884
|
Merge branch 'dev_bug_select_staff'
|
3 years ago |
|
zxc
|
b8651d565e
|
Merge branch 'dev_ic_user_match_grid'
|
3 years ago |
|
zxc
|
06ce0211b7
|
emm
|
3 years ago |
|
zxc
|
4456ea5d55
|
emm
|
3 years ago |
|
zhangyuan
|
a825c96b24
|
还原
|
3 years ago |
yinzuomei
|
f9b5c74ddb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
b0db08200a
|
新增部门
|
3 years ago |
|
zhangyuan
|
863b10523c
|
shandiao
|
3 years ago |
|
syc
|
9a4fa92cc2
|
Merge branch 'dev_project_hd_syc'
|
3 years ago |
|
syc
|
0c543dd1cc
|
应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
|
3 years ago |
|
zhangyuan
|
945d6b602a
|
?
|
3 years ago |
|
zhangyuan
|
b0ae123722
|
试试
|
3 years ago |
|
zxc
|
7df0589a97
|
添加客户ID
|
3 years ago |
|
zxc
|
a708356bb2
|
加白名单 略改
|
3 years ago |
|
zhangyuan
|
b145fea023
|
试试
|
3 years ago |
|
zhangyuan
|
fc33938ce5
|
试试
|
3 years ago |
|
zxc
|
228151f933
|
匹配身份证
|
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 |
|
zhangyuan
|
09b06d3300
|
冗余
|
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 |
|
zhangyuan
|
6a2de9a42d
|
访客登出
|
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 |
|
zhangyuan
|
7e7991978d
|
job增加插件调用
|
3 years ago |
|
wangxianzhang
|
a79b27db38
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
