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 |
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
|
e4d67b967b
|
Merge branch 'dev_routine_work_syc' into 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 |
|
jianjun
|
725b0ed4d3
|
更新时间
|
4 years ago |
|
jianjun
|
73efe42f6b
|
更新下日志
|
4 years ago |
|
jianjun
|
a443418048
|
更新吧 少年
|
4 years ago |
|
jianjun
|
e82142c941
|
改bug
|
4 years ago |
|
jianjun
|
77452add38
|
改bug
|
4 years ago |
|
jianjun
|
dcbb53dd66
|
弄个日志上去 up
|
4 years ago |
|
jianjun
|
c778eb6238
|
弄个日志上去
|
4 years ago |
|
jianjun
|
ecb1d64ed7
|
运营情况导出例行工作次数2
|
4 years ago |
|
zxc
|
c2027610a9
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
|
zxc
|
85b43acd98
|
emm
|
4 years ago |
|
zxc
|
cb49be1888
|
emm
|
4 years ago |
|
jianjun
|
01bfc2a224
|
运营情况导出例行工作次数
|
4 years ago |
|
zxc
|
b228bad86f
|
emm
|
4 years ago |
|
zxc
|
fb1fffb680
|
emm
|
4 years ago |
|
zxc
|
979148f6ad
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
a2f7c1c6e7
|
加筛选条件
|
4 years ago |
|
zxc
|
826c7cfa07
|
缓存时间
|
4 years ago |
|
zxc
|
a3d092549e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
7618b97031
|
起线程
|
4 years ago |
|
zxc
|
e331e31f91
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
9c3d9f35ce
|
位置调整
|
4 years ago |
|
sunyuchao
|
9621946e42
|
Merge branch 'dev_bug_syc_0217' into dev
|
4 years ago |
|
sunyuchao
|
be77beb872
|
运营数据导出列头日期不对问题修改
|
4 years ago |
|
zxc
|
cb69a28370
|
bug修复
|
4 years ago |
|
zxc
|
70a02cdd0e
|
bug修复
|
4 years ago |
|
wangxianzhang
|
cb3839b821
|
修改：
- 居民导入优化
|
4 years ago |
|
wangxianzhang
|
ec1eee8d70
|
修改：
- 居民导入：增加导入任务记录
|
4 years ago |
|
zxc
|
690aade8b8
|
小区导入
|
4 years ago |
|
yinzuomei
|
2596e5ae3c
|
测试
|
4 years ago |
|
yinzuomei
|
55a44bfec6
|
更新用户积分(双实信息更新 网格巡查)-仅限榆山街道的工作人员
|
4 years ago |
|
zxc
|
dde9ff2ba8
|
小区导入
|
4 years ago |
zhaoqifeng
|
96b7ff3c83
|
获取小区，楼栋，单元ID
|
4 years ago |
|
jianjun
|
f8c123bfb4
|
优化程序 导出居民信息
|
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
|
dca3320487
|
neighborHood单词改动去掉u
|
4 years ago |
|
sunyuchao
|
80b18cf605
|
网格员例行工作接口初版
|
4 years ago |
|
zxc
|
026af1d353
|
楼栋导入
|
4 years ago |
|
zxc
|
08dade0fb5
|
dto改改名
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
4 years ago |
