wxz
|
cc61b3a320
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
07823edf01
|
Merge branches 'dev' and 'wxz_thread_var_clean' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thread_var_clean
|
4 years ago |
|
wxz
|
776712c019
|
Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
|
4 years ago |
|
wxz
|
5df3664c7d
|
Merge branches 'dev' and 'wxz_feign_datetime' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_datetime
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java
|
4 years ago |
|
wxz
|
87ccc61f7f
|
版本升级
|
4 years ago |
sunyuchao
|
d0613fe2a0
|
议题统计bug修改【赵】
|
4 years ago |
|
sunyuchao
|
c3c2c31ef9
|
Merge branch 'dev'
|
4 years ago |
zhaoqifeng
|
a87ba81c5c
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15b162c8c5
|
议题统计修改
|
4 years ago |
jianjun
|
26576bcbe4
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
b1e7540a8f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
b47f737c57
|
去掉无用注入
|
4 years ago |
|
sunyuchao
|
7d26401b42
|
去掉无用参数
|
4 years ago |
|
sunyuchao
|
986fc9181a
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
0acfd76bd6
|
去除无用接口入参
|
4 years ago |
|
jianjun
|
27152608c7
|
人员管理查询 栈溢出 上线
|
4 years ago |
yinzuomei
|
cf59bdfa38
|
report
|
4 years ago |
|
yinzuomei
|
2544abdbc7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
9d0421cfd8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
53b0d9e40f
|
/epmet/ext/staff/permissionv2
|
4 years ago |
zxc
|
941d038837
|
微调
|
4 years ago |
|
yinzuomei
|
f68a403ef2
|
/epmet/ext/staff/permissionv2
|
4 years ago |
|
yinzuomei
|
bb5c5dca23
|
/workrecord/ranklist接口调整 发布
|
4 years ago |
|
yinzuomei
|
aa182e43b0
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
17d694630d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
9afde0a5b0
|
/workrecord/ranklist接口调整
|
4 years ago |
|
zxc
|
e69fd4d564
|
修改查询客户下所有用户包括陌生人
|
4 years ago |
|
yinzuomei
|
75ac004fca
|
/data/stats/plugins/workrecord/org-monthly增加pid,pids fb
|
4 years ago |
|
yinzuomei
|
03d0db22ae
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
67e9613512
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4867ae8ec7
|
/data/stats/plugins/workrecord/org-monthly增加pid,pids
|
4 years ago |
|
sunyuchao
|
74e131ffc0
|
议题项目第一版数据统计逻辑调整发布生产
|
4 years ago |
|
sunyuchao
|
99f99b5486
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
373c0d72ea
|
Merge branch 'dev_stats_fix' into dev
|
4 years ago |
|
jianjun
|
7bfcd7c994
|
auth 认证调整 上线
|
4 years ago |
|
jianjun
|
591f95151c
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
wxz
|
686961043b
|
修改：如果根据currentAgencyId查不到组织信息,不再报错，直接返回空权限列表即可
|
4 years ago |
|
jianjun
|
9b5edbe78b
|
客户首页配置 去掉客户自定义演示数据的功能 上线
|
4 years ago |
|
jianjun
|
842bdacd33
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
zxc
|
17ec365ee1
|
客户改全局
|
4 years ago |
|
jianjun
|
03ce33972b
|
补充党员信息 上线
|
4 years ago |
|
jianjun
|
a5b6cd30e5
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
285863d5d0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c5ec22c1ef
|
添加日志
|
4 years ago |
|
zhaoqifeng
|
4e27e89edf
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
243786f3b4
|
党员认证补充信息时，由于没匹配到自动审核失败的数据（原因是提交信息时人工进行了审核），报了空指针异常
|
4 years ago |
|
zhaoqifeng
|
141a1a94fb
|
议题统计-网格删除
|
4 years ago |
|
sunyuchao
|
d17e6183de
|
项目-数据-机关日统计逻辑完善
|
4 years ago |
|
zhaoqifeng
|
92ae013a35
|
议题统计-网格删除
|
4 years ago |
|
yinzuomei
|
f7cd1de247
|
bugfix发布
|
4 years ago |
