jianjun
|
f96e874d43
|
配置pc客户菜单时 删除缓存 up
|
4 years ago |
|
jianjun
|
d029d4c185
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
5ccc1ae55c
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
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
|
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 |
|
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
|
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
|
c91dc63072
|
根据staffId查询用户基本信息接口返回客户名
|
4 years ago |
|
zhaoqifeng
|
1d58c4e52b
|
根据staffId查询用户基本信息接口返回客户名
|
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
|
4ceee13be0
|
例行工作bugfix1
|
4 years ago |
|
yinzuomei
|
d62486c801
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
45775fc7d1
|
例行工作bugfix
|
4 years ago |
wangxianzhang
|
94fe745ff0
|
修改：
1.市北生产环境 镜像仓库地址
|
4 years ago |
|
wangxianzhang
|
af6ce5b0cf
|
修改：
1.居民导入-市北线上环境参数修改
|
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 |
|
jianjun
|
0772fc34ca
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
b3677b3ab0
|
巡查间隔20s
|
4 years ago |
|
jianjun
|
17e604af3d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
750c2cf50c
|
去掉修改
|
4 years ago |
|
jianjun
|
45c91b6786
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into dev
|
4 years ago |
|
wangxianzhang
|
6230c5dc49
|
微调
|
4 years ago |
|
wangxianzhang
|
0da1035fea
|
修复：
1.居民导入：options缓存问题
|
4 years ago |
|
yinzuomei
|
cef7095969
|
Merge remote-tracking branch 'origin/dev_yushan' into dev
|
4 years ago |
|
yinzuomei
|
9304fe2871
|
/epmetuser/patrolroutinework/add修改
|
4 years ago |
|
jianjun
|
a5b7e0e5e3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
fa74f114b1
|
例行工作次数 导出
|
4 years ago |
|
jianjun
|
6a8fd02825
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
229ae8ac42
|
bug改一下 例行工作次数 匹配不到
|
4 years ago |
|
jianjun
|
d62b5b13a5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
841c60dc60
|
项目变动粒度缩小为projectId
|
4 years ago |
|
wangxianzhang
|
2d2969f08c
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
79f4a9ea5f
|
修复：
- 居民导入：附加信息表中，判断是否为新增用户的逻辑错误
|
4 years ago |
