jianjun
|
ad743a6c92
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）； 优化代码可读性； up
|
4 years ago |
|
jianjun
|
24b15467ed
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
24df6b0d99
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
jianjun
|
f00999e246
|
一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
|
4 years ago |
zhaoqifeng
|
4930b86338
|
数据统计升级
|
4 years ago |
|
zhaoqifeng
|
166d8f9d06
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
2b4a7671c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
0e0b230993
|
治理能力统计修改
|
4 years ago |
|
zhaoqifeng
|
33240eabe8
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
a27771287e
|
数据统计升级
|
4 years ago |
|
zhaoqifeng
|
43c88f1473
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
bcc1ec34b7
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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 |
|
jianjun
|
e8bb2fce86
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
174dfa5989
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
e972128152
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
2bb768d6dd
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
6b413274da
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
1c2a843874
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
a641e679e1
|
这一批都执行完再继续其他的
|
4 years ago |
|
jianjun
|
d8078aa717
|
话题 网格为空时 继续下次 up
|
4 years ago |
|
zhaoqifeng
|
d0c28354f5
|
党员抽取修改
|
4 years ago |
|
jianjun
|
70f5e1e385
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
1fcbf67031
|
话题 网格为空时 继续下次
|
4 years ago |
|
zhaoqifeng
|
ab2440d23f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
cff289eca5
|
话题 网格为空时 继续下次
|
4 years ago |
|
zhaoqifeng
|
a42931f6d7
|
项目抽取修改
|
4 years ago |
|
jianjun
|
a236cbf7a2
|
暂时先加上吧
|
4 years ago |
|
jianjun
|
34cca4d59d
|
bug 改不尽
|
4 years ago |
|
jianjun
|
79db617df5
|
处理排序
|
4 years ago |
|
jianjun
|
7163c1b0e0
|
用map 获取用户里的信息
|
4 years ago |
|
jianjun
|
3c816167cb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
20122b4936
|
治理能力统计修改
|
4 years ago |
|
zhaoqifeng
|
3684815b14
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
62cca3010b
|
如果项目只选择了一级分类 默认给第一个二级分类 up
|
4 years ago |
|
jianjun
|
3baffe6e8f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
4b68d8418a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
7f0e50982d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
70d621c3c4
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2ec966f7aa
|
如果项目只选择了一级分类 默认给第一个二级分类
|
4 years ago |
|
zhaoqifeng
|
0358f41bb6
|
治理能力统计修改
|
4 years ago |
|
jianjun
|
2ed5d322ee
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
zxc
|
93d8e766d8
|
data-agg,user升级
|
4 years ago |
|
zxc
|
ebe66fcaa7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
69992d881b
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
37d49501aa
|
agg的entity添加字段
|
4 years ago |
