yinzuomei
|
1c66b86c52
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
b5d6ec8bd4
|
组织网格增加centerAddress中心点位地址
|
4 years ago |
|
yinzuomei
|
290022b45d
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
462cbfe6b7
|
/gov/org/agency/addagency-v2新增组织，增加中心点位
|
4 years ago |
|
yinzuomei
|
de74af16c5
|
/gov/org/agency/editagency修改组织，增加中心点位
|
4 years ago |
|
yinzuomei
|
1282927f0f
|
/gov/org/grid/editgrid修改网格，增加中心点位
|
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
|
e554f39c5c
|
/gov/org/grid/addgrid新增网格，增加中心点位
|
4 years ago |
|
yinzuomei
|
41ff03a87c
|
Merge branch 'release_temp' of http://121.42.41.42:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
yinzuomei
|
5cbc00fbb1
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
17b3cc3ccd
|
Merge remote-tracking branch 'origin/dev_yushan' into develop
|
4 years ago |
|
yinzuomei
|
680783967d
|
代码冲突
|
4 years ago |
|
yinzuomei
|
ff9015baf6
|
Merge remote-tracking branch 'origin/dev_import' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
|
4 years ago |
|
yinzuomei
|
e247d78303
|
删除社会组织字典
|
4 years ago |
|
yinzuomei
|
880f21c9b4
|
sys/dict/data/dictlist限制sys_dict_data.del_flag='0'
|
4 years ago |
jianjun
|
1d6021a08e
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
d898422835
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
dfc0d4f193
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
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
|
633deba5c3
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
96a6a84060
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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 |
