jianjun
|
5d9828085c
|
配置pc客户菜单时 删除缓存
|
4 years ago |
|
jianjun
|
69dd134c53
|
导航菜单添加缓存 up
|
4 years ago |
|
jianjun
|
99650af09f
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
c3863f00f7
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
4 years ago |
|
jianjun
|
0953990bf2
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7589b5a6b2
|
导航菜单添加缓存
|
4 years ago |
|
jianjun
|
103ce2e56c
|
heart up
|
4 years ago |
|
jianjun
|
7a692da428
|
heart up
|
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 |
|
jianjun
|
50a7123f99
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
758beb7b7a
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
4 years ago |
|
zhaoqifeng
|
c115a21712
|
heart服务升级
|
4 years ago |
|
zhaoqifeng
|
17b64bb0f1
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
17cb880d21
|
党建单位分类统计sql修改
|
4 years ago |
|
jianjun
|
12ca4d2430
|
org user up
|
4 years ago |
|
jianjun
|
991ebcbf40
|
Merge remote-tracking branch 'remotes/origin/dev' into prod
|
4 years ago |
|
jianjun
|
703234a800
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
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 |
|
jianjun
|
4a30977806
|
Merge remote-tracking branch 'remotes/origin/dev' into prod
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
jianjun
|
5f87246e9e
|
Merge remote-tracking branch 'remotes/origin/shibei_master' into master_for_shibei
|
4 years ago |
|
jianjun
|
31ef3be4a1
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into master_for_shibei
|
4 years ago |
|
jianjun
|
43a80e52ac
|
更改mq topic
|
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 |
wangxianzhang
|
94fe745ff0
|
修改：
1.市北生产环境 镜像仓库地址
|
4 years ago |
|
wangxianzhang
|
af6ce5b0cf
|
修改：
1.居民导入-市北线上环境参数修改
|
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 |
|
wangxianzhang
|
fe8ca74177
|
修改：
1.居民导入-市北线上环境参数修改
|
4 years ago |
|
zhaoqifeng
|
de1e5ae229
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
22623aa25c
|
联建活动关联多个单位和服务事项
|
4 years ago |
