yinzuomei
|
1d394ba48c
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
0b65b61a65
|
已有专题列表优化
|
4 years ago |
|
yinzuomei
|
6b0598a898
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
4aa82b78a8
|
已有专题列表优化
|
4 years ago |
|
yinzuomei
|
9206167b65
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
5e0035f74e
|
已有专题列表优化
|
4 years ago |
|
yinzuomei
|
100431ec40
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
deafa99082
|
已有专题列表优化
|
4 years ago |
|
yinzuomei
|
ab271ca715
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
659ca2929c
|
已有专题列表优化
|
4 years ago |
zxc
|
fc6e36d34d
|
优化
|
4 years ago |
|
zxc
|
84460ddff0
|
小组统计【网格-日】删除，插入分页
|
4 years ago |
|
zxc
|
2cb7d3b20f
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
b0a49f1409
|
标签去重
|
4 years ago |
zhaoqifeng
|
a87ba81c5c
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15b162c8c5
|
议题统计修改
|
4 years ago |
|
zxc
|
c22b399b13
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
87c6da96aa
|
sql调整˚
|
4 years ago |
|
zxc
|
ba783d5ed3
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
519b023cc3
|
sql调整
|
4 years ago |
|
zhaoqifeng
|
e77cd73332
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
5d83cb26f7
|
专题管理-效果预览-分页参数修改
|
4 years ago |
|
zxc
|
f4a2e269a1
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
701500f3d7
|
aaa
|
4 years ago |
jianjun
|
b1e7540a8f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
b47f737c57
|
去掉无用注入
|
4 years ago |
|
zxc
|
a8de3d1260
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
d2c292e285
|
paixu
|
4 years ago |
|
zxc
|
3e9fa3b90e
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
e03a02d078
|
限制条件
|
4 years ago |
sunyuchao
|
f8d3ae847c
|
Merge branch 'dev_bug_sycsyc' into develop
|
4 years ago |
|
sunyuchao
|
0acfd76bd6
|
去除无用接口入参
|
4 years ago |
|
zxc
|
5105a18f62
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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 |
|
zxc
|
db539cc0b3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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
|
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
|
373c0d72ea
|
Merge branch 'dev_stats_fix' into dev
|
4 years ago |
|
sunyuchao
|
3e33c1e0db
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
sunyuchao
|
7ce2ade6c2
|
pids为空返回0
|
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 |
