zxc
|
2abd82746d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
a2f7c1c6e7
|
加筛选条件
|
4 years ago |
|
zxc
|
0912231596
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
fa7941b8ac
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
9063bf2b54
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
826c7cfa07
|
缓存时间
|
4 years ago |
|
zxc
|
a3d092549e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
sunyuchao
|
42bf4758ab
|
Merge branch 'dev_bug_syc_0217' into develop
|
4 years ago |
|
zxc
|
7618b97031
|
起线程
|
4 years ago |
|
zxc
|
e331e31f91
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
yinzuomei
|
80888c0938
|
测试
|
4 years ago |
|
zxc
|
9c3d9f35ce
|
位置调整
|
4 years ago |
|
yinzuomei
|
50d3b1415d
|
Merge remote-tracking branch 'origin/dev_yushan' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
|
4 years ago |
|
sunyuchao
|
9621946e42
|
Merge branch 'dev_bug_syc_0217' into dev
|
4 years ago |
|
sunyuchao
|
be77beb872
|
运营数据导出列头日期不对问题修改
|
4 years ago |
|
zxc
|
0905c27a20
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5411362c6c
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
cb69a28370
|
bug修复
|
4 years ago |
|
zxc
|
3f675ba3c4
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
f219c1ab0b
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
70a02cdd0e
|
bug修复
|
4 years ago |
wangxianzhang
|
1f185c2f4d
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
4c13d36300
|
修改：
- 调整user的内存限制
|
4 years ago |
|
wangxianzhang
|
be319b3aea
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
cb3839b821
|
修改：
- 居民导入优化
|
4 years ago |
|
wangxianzhang
|
5509c2bcd2
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
ec1eee8d70
|
修改：
- 居民导入：增加导入任务记录
|
4 years ago |
|
zxc
|
1a99ef5487
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
a75be66a14
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
690aade8b8
|
小区导入
|
4 years ago |
|
yinzuomei
|
2596e5ae3c
|
测试
|
4 years ago |
|
yinzuomei
|
55a44bfec6
|
更新用户积分(双实信息更新 网格巡查)-仅限榆山街道的工作人员
|
4 years ago |
|
sunyuchao
|
cdbd7e8de6
|
Merge branch 'dev_routine_work_syc' into develop
|
4 years ago |
|
zxc
|
77f74ad343
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
e79fd41bfe
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
dde9ff2ba8
|
小区导入
|
4 years ago |
zhaoqifeng
|
96b7ff3c83
|
获取小区，楼栋，单元ID
|
4 years ago |
jianjun
|
fcd85abaaf
|
Merge branches 'release_temp' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
a813442a70
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
jianjun
|
f8c123bfb4
|
优化程序 导出居民信息
|
4 years ago |
|
yinzuomei
|
9b3e96ca84
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
b0f2553210
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
b0caedf10b
|
暂提
|
4 years ago |
|
yinzuomei
|
59310e0914
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
|
4 years ago |
|
yinzuomei
|
1a9cf7194a
|
可视化-党员风采分页展示
|
4 years ago |
|
zxc
|
7bf98609dd
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
dca3320487
|
neighborHood单词改动去掉u
|
4 years ago |
|
sunyuchao
|
80b18cf605
|
网格员例行工作接口初版
|
4 years ago |
|
zxc
|
cf8936d2e1
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
026af1d353
|
楼栋导入
|
4 years ago |
