sunyuchao
|
7d2d086bff
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
70da059ff9
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
sunyuchao
|
0403fb40cc
|
转项目、立项选人接口去掉权限
|
4 years ago |
|
sunyuchao
|
0466477944
|
巡查列表程序优化
|
4 years ago |
yinzuomei
|
2ca25dab9e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
20820b5eb0
|
居民排行、大屏热心市民排序统一改为：先按照总积分降序，再按照姓名拼音升序。
|
4 years ago |
jianjun
|
e8082f2ae5
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
80ad58de56
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
8b00ed7e98
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
2d253b2bd4
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
5b99842c55
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
9ab2c03fc7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
50babd183b
|
先进排行查询-添加areaCode
|
4 years ago |
wxz
|
30553c4cde
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
5b05cf0110
|
优化网格员数据统计查询接口
|
4 years ago |
|
yinzuomei
|
02cd2632b2
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
69f94e57ea
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
736b2390aa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
a7379075f9
|
丢了#
|
4 years ago |
|
yinzuomei
|
7fb90d74e6
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
de12358914
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
495c767ded
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
c44b7cbb0a
|
工作端下级组织指数排行与平阴大屏下级单位指数排行保持一致，取月表
|
4 years ago |
|
sunyuchao
|
69492d3565
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
6014f9fcc2
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
e1c8379fbc
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
sunyuchao
|
e8dc33ccdf
|
更多-巡查记录-程序优化
|
4 years ago |
|
wxz
|
e3a1bdb3d0
|
Merge branch 'dev' into release_temp
|
4 years ago |
|
wxz
|
463e65804a
|
Merge branch 'dev' into develop
|
4 years ago |
|
wxz
|
d98405c31f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wxz
|
d73a975c16
|
修改：gateway中增加请求url的日志，和报错的日志
|
4 years ago |
zhaoqifeng
|
3a65bc20ab
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
f870d366ec
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
aa8d555e25
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
61266c83a2
|
党员认证某种情况下提交两次bug修改
|
4 years ago |
|
wxz
|
b946b09dbf
|
修改：RequestLogAspect的拦截路径改为com.epmet.dataaggre.controller..*Controller.*(..)),匹配controller包及其子包下所有controller
|
4 years ago |
|
jianjun
|
b92317792e
|
删除无用类
|
4 years ago |
|
jianjun
|
9afeb1d03d
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
fc7951ebfa
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
4b244048c9
|
集成平台接口对外暴露
|
4 years ago |
|
jianjun
|
9a5281fba1
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
90518f5a57
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
1c73258d8d
|
Merge remote-tracking branch 'remotes/origin/dev_py_platform' into develop
|
4 years ago |
|
jianjun
|
cf68bd8b88
|
集成平台接口对外暴露
|
4 years ago |
zxc
|
98bd53872d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
518be07ba4
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
3b33bf2fb9
|
展示name
|
4 years ago |
|
zxc
|
8c3ec0c523
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
4ffd57f310
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
0fc473f565
|
img
|
4 years ago |
