sunyuchao
|
57a269bf44
|
党员风采和社会自组织上传改为异步
|
4 years ago |
jianjun
|
f08d83d3cd
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
5a07a84b05
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
9919509c6f
|
挪走了
|
4 years ago |
|
jianjun
|
321a7bcb43
|
日志级别调整
|
4 years ago |
wangxianzhang
|
42cd21c833
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
372ea3864f
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
60a7b0d08e
|
增加 common-service importTask的flyway脚本
|
4 years ago |
|
wangxianzhang
|
fd47af4a83
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
9896ff818d
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
d4258aa9b5
|
增加 common-service importTask的flyway脚本
|
4 years ago |
|
jianjun
|
a5c43691f3
|
配置pc客户菜单时 删除缓存 up
|
4 years ago |
|
jianjun
|
0a44b97a12
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
ad710813cb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
5d9828085c
|
配置pc客户菜单时 删除缓存
|
4 years ago |
|
jianjun
|
0953990bf2
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7589b5a6b2
|
导航菜单添加缓存
|
4 years ago |
zhaoqifeng
|
2248e362d3
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
260d9bf2af
|
Merge branch 'dev_shuzipingtai_202202_bug' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
|
4 years ago |
|
zhaoqifeng
|
c115a21712
|
heart服务升级
|
4 years ago |
|
zhaoqifeng
|
17b64bb0f1
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
17cb880d21
|
党建单位分类统计sql修改
|
4 years ago |
|
zhaoqifeng
|
eca662333f
|
user服务升级
|
4 years ago |
|
zhaoqifeng
|
bf9350c50f
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
cc782e9191
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
c91dc63072
|
根据staffId查询用户基本信息接口返回客户名
|
4 years ago |
|
zhaoqifeng
|
b86a15de20
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
1d58c4e52b
|
根据staffId查询用户基本信息接口返回客户名
|
4 years ago |
zxc
|
162df0d214
|
user，org 升级
|
4 years ago |
|
zxc
|
893cbcc6f1
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
0804b61d83
|
user，org
|
4 years ago |
yinzuomei
|
4ef64f00c9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
3cb56cc011
|
user up 241
|
4 years ago |
|
yinzuomei
|
6086b3f9d6
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
4ceee13be0
|
例行工作bugfix1
|
4 years ago |
|
yinzuomei
|
5dbe53b923
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
d62486c801
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
45775fc7d1
|
例行工作bugfix
|
4 years ago |
|
zhaoqifeng
|
0f77c00dc8
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
e80c4e6733
|
联建活动关联多个单位和服务事项修改
|
4 years ago |
|
zhaoqifeng
|
6bc7c62445
|
联建活动关联多个单位和服务事项sql脚本
|
4 years ago |
|
zxc
|
743cac2c6a
|
user，org升级
|
4 years ago |
|
zxc
|
4ab4e2e4e5
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
5d8f3efca1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
f9cfd79589
|
bug
|
4 years ago |
|
zhaoqifeng
|
de1e5ae229
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
22623aa25c
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
wangxianzhang
|
cac5783faf
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
d59d188754
|
修改：
1.居民导入-改为异步-待测试
|
4 years ago |
|
zhaoqifeng
|
5410fbd949
|
Merge branch 'dev_import' into develop
|
4 years ago |
