jianjun
|
a8b909513a
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
2878b76f60
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
|
4 years ago |
|
jianjun
|
1720579441
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
|
4 years ago |
|
jianjun
|
58199f4d14
|
项目网格Id 从事件中填充
|
4 years ago |
|
jianjun
|
c311949942
|
表单初始化暂存
|
4 years ago |
sunyuchao
|
d23401c039
|
【项目分类分析】各分类项目数图表
|
4 years ago |
zxc
|
98e9a1cf4a
|
emm
|
4 years ago |
yinzuomei
|
32113e6307
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
yinzuomei
|
b18f1a4558
|
/heart/userdemand/mydemand返参增加一级分类编码
|
4 years ago |
|
sunyuchao
|
8fcb8cf1cf
|
【项目分类分析】方法模板
|
4 years ago |
|
yinzuomei
|
e18ea027e2
|
/heart/userdemand/mydemand入参改为icResiUserId
|
4 years ago |
|
zxc
|
af133e2168
|
加上网格限制
|
4 years ago |
|
jianjun
|
f39278f443
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
867b6aebb4
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
077f5381cc
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）； 优化代码可读性；
|
4 years ago |
|
sunyuchao
|
5a94f7a20a
|
【项目处理分析】按状态查询项目列表
|
4 years ago |
|
jianjun
|
f00999e246
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
|
4 years ago |
|
yinzuomei
|
cf3a4c8473
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
d1965876e7
|
事件列表
|
4 years ago |
|
yinzuomei
|
f14ebb24c0
|
积分记录入参epmetUserIdList
|
4 years ago |
zhaoqifeng
|
2b4a7671c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
0e0b230993
|
治理能力统计修改
|
4 years ago |
|
yinzuomei
|
31f9d2e360
|
积分记录入参epmetUserIdList
|
4 years ago |
|
yinzuomei
|
203ee60a3a
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
yinzuomei
|
b3f8053f37
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
d9c81f6af5
|
"mydemand"入参增加epmetUserIdList
|
4 years ago |
|
zxc
|
87fbaa7ab3
|
emm
|
4 years ago |
|
yinzuomei
|
e154b2fa1c
|
/epmetuser/icresiuser/persondata返参增加epmetUserIdList
|
4 years ago |
|
sunyuchao
|
59418ae427
|
LinkedList
|
4 years ago |
|
zhaoqifeng
|
43c88f1473
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
45d017a793
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
yinzuomei
|
46fbc07f54
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
3fa03b586c
|
修改信息、注册居民、认证党员之自动注册居民都不再校验身份证号客户内唯一
|
4 years ago |
|
zhaoqifeng
|
2b29edde9e
|
Merge branch 'develop' into release_temp
|
4 years ago |
wangxianzhang
|
aa2836b2fb
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
zhaoqifeng
|
1b67029faa
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
2a859c90ad
|
右饼
|
4 years ago |
|
sunyuchao
|
b60d3304be
|
【项目处理分析】事件总数查询
|
4 years ago |
|
sunyuchao
|
15dd331cb8
|
【项目处理分析】事件总数查询
|
4 years ago |
|
zxc
|
9078f2b787
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
zxc
|
93f64369b4
|
左边饼
|
4 years ago |
|
wangxianzhang
|
5c88a6ad0a
|
Merge branch 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
9f6b32a3a8
|
修改：
修改BlockChainService中getResultOrThrowException()入参列表
|
4 years ago |
|
wangxianzhang
|
1772d47a30
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
|
wangxianzhang
|
d793c9d5b3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
|
4 years ago |
|
jianjun
|
33d5eaf758
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
|
4 years ago |
|
zhaoqifeng
|
5aa5e48473
|
治理能力统计修改
|
4 years ago |
|
wangxianzhang
|
e5051a3b0c
|
Merge branch 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
e972128152
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
1c2a843874
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
