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 |
jianjun
|
9e64a22033
|
巡查间隔20s up
|
4 years ago |
|
jianjun
|
870959b39c
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
ac140495a1
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
64861d2761
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
89907988a9
|
版本升级
|
4 years ago |
|
wangxianzhang
|
ba12299dff
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
0da1035fea
|
修复：
1.居民导入：options缓存问题
|
4 years ago |
yinzuomei
|
874bf9d6a2
|
/epmetuser/patrolroutinework/add修改 up
|
4 years ago |
|
yinzuomei
|
1818167ffc
|
Merge remote-tracking branch 'origin/dev'
|
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
|
3b0ee39d90
|
例行工作次数 导出
|
4 years ago |
|
jianjun
|
e1dad2a6ce
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
97026501e6
|
bug改一下 例行工作次数 匹配不到 up
|
4 years ago |
|
jianjun
|
300f9f21c7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
652bb54362
|
agg stats up
|
4 years ago |
|
jianjun
|
7f87ccc0b0
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
d12732f0ed
|
版本升级
|
4 years ago |
|
wangxianzhang
|
9a1fe7c67b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
yinzuomei
|
002fd53fed
|
yushan up:user+project
|
4 years ago |
|
yinzuomei
|
fa34dfb9da
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
wangxianzhang
|
79f4a9ea5f
|
修复：
- 居民导入：附加信息表中，判断是否为新增用户的逻辑错误
|
4 years ago |
|
yinzuomei
|
e4653e1d8f
|
冲突
|
4 years ago |
|
yinzuomei
|
dd31f2aadd
|
Merge branches 'dev' and 'dev_yushan' of http://121.42.41.42:7070/r/epmet-cloud into dev_yushan
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
|
4 years ago |
sunyuchao
|
18f78db2d7
|
网格员例行工作发布生产
|
4 years ago |
|
sunyuchao
|
1ff7f13d81
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
e4d67b967b
|
Merge branch 'dev_routine_work_syc' into dev
|
4 years ago |
|
zxc
|
2b7ae00e10
|
org升级
|
4 years ago |
|
zxc
|
cc5b771dd7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
f8de040cc5
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev
|
4 years ago |
|
zxc
|
f728fd9a1a
|
修复
|
4 years ago |
|
zxc
|
1aec70b44c
|
显示
|
4 years ago |
|
zxc
|
2dc95d6b38
|
bug
|
4 years ago |
