sunyuchao
|
533a3308a7
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
3e33c1e0db
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
sunyuchao
|
7ce2ade6c2
|
pids为空返回0
|
4 years ago |
wxz
|
0100472aae
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
wxz
|
d3fead5f53
|
Merge branch 'wxz_permission_fix' into release_temp
# Conflicts:
# epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
|
4 years ago |
|
sunyuchao
|
bbd4ac71d5
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
wxz
|
e9116ea004
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
wxz
|
3b07b85e72
|
Merge branch 'wxz_permission_fix' into develop
# Conflicts:
# epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
|
4 years ago |
|
sunyuchao
|
ba139ad812
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
wxz
|
686961043b
|
修改：如果根据currentAgencyId查不到组织信息,不再报错，直接返回空权限列表即可
|
4 years ago |
|
sunyuchao
|
d8464502c8
|
pids为空返回0
|
4 years ago |
|
wxz
|
94f64e3bcd
|
Merge branch 'dev_permission_fix' into release_temp
|
4 years ago |
|
wxz
|
f6dc1060ca
|
Merge branch 'dev_permission_fix' into develop
|
4 years ago |
|
wxz
|
99a1d3b057
|
修改：如果根据currentAgencyId查不到组织信息,不再报错，直接返回空权限列表即可
|
4 years ago |
|
wxz
|
f657621678
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
zhaoqifeng
|
66d56080c3
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
b3a5430ff4
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
a853519e4d
|
专题管理-入参校验
|
4 years ago |
zxc
|
7f266aa4b5
|
Merge remote-tracking branch 'origin/dev_bug_customize' into develop
|
4 years ago |
|
zxc
|
17ec365ee1
|
客户改全局
|
4 years ago |
jianjun
|
285863d5d0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c5ec22c1ef
|
添加日志
|
4 years ago |
|
wxz
|
2570ba94a5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
zhaoqifeng
|
d3cd785765
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
387eb038d2
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
81d5db50d9
|
专题管理-效果预览
|
4 years ago |
|
zhaoqifeng
|
4e27e89edf
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
243786f3b4
|
党员认证补充信息时，由于没匹配到自动审核失败的数据（原因是提交信息时人工进行了审核），报了空指针异常
|
4 years ago |
|
wxz
|
2ea97824db
|
Merge branch 'wxz_thread_var_clean' into dev
|
4 years ago |
|
jianjun
|
f848d74b6b
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_special_subject
|
4 years ago |
|
zhaoqifeng
|
1260ad84d2
|
Merge branch 'dev_stats_fix' into develop
|
4 years ago |
|
zhaoqifeng
|
141a1a94fb
|
议题统计-网格删除
|
4 years ago |
|
sunyuchao
|
628199cad2
|
Merge branch 'dev_stats_fix' into develop
|
4 years ago |
|
sunyuchao
|
d17e6183de
|
项目-数据-机关日统计逻辑完善
|
4 years ago |
yinzuomei
|
7e93a31700
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
604108c980
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
dcb20bb072
|
专题管理-热门标签
|
4 years ago |
|
zhaoqifeng
|
92ae013a35
|
议题统计-网格删除
|
4 years ago |
|
yinzuomei
|
eddddfc91d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4d2510ebe5
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
7e55b3fa02
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
e450d16180
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
0c39718d4a
|
Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject
|
4 years ago |
|
yinzuomei
|
03353bed39
|
jiageshijian
|
4 years ago |
|
zhaoqifeng
|
a2aed1a952
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
0232b16fbf
|
专题管理-效果预览封面
|
4 years ago |
|
zhaoqifeng
|
f08dfc9d2f
|
专题管理-效果预览封面
|
4 years ago |
|
zxc
|
6eecc2c63e
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
b7408416c6
|
添加封面字段
|
4 years ago |
|
yinzuomei
|
8ed417aad5
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
