zxc
|
70a02cdd0e
|
bug修复
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
zxc
|
e134aa33f7
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
# 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 |
|
zxc
|
62531ac5b5
|
build
|
4 years ago |
|
zxc
|
f6db2496d9
|
暂提
|
4 years ago |
|
zxc
|
21b453c87e
|
emm 合并
|
4 years ago |
|
jianjun
|
beaf429f08
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_query
|
4 years ago |
|
zhaoqifeng
|
12248915d1
|
获取小区，楼栋，单元ID
|
4 years ago |
|
zxc
|
07b6b00603
|
gailegeming
|
4 years ago |
|
zxc
|
5061020e4c
|
暂提
|
4 years ago |
|
wangxianzhang
|
f605121edb
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zxc
|
969ef28f61
|
楼栋导入
|
4 years ago |
|
wangxianzhang
|
df4b0c9c9b
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e41cf5a506
|
- 优化居民导入
- 优化日志切面打印，增加对MultipartFile类型的过滤
|
4 years ago |
|
zxc
|
634c5d5927
|
楼栋存在状态添加
|
4 years ago |
|
zxc
|
8c5a856d2b
|
楼栋存在状态添加
|
4 years ago |
|
zxc
|
f1ca1029e8
|
dto改改名
|
4 years ago |
|
zxc
|
1c803ebc4f
|
Merge branch 'dev_addcate_and_import' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
|
zxc
|
39b4f7c1ad
|
房屋导入
|
4 years ago |
|
zxc
|
dcf517d774
|
房屋导入暂提
|
4 years ago |
|
wangxianzhang
|
17c7264d82
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_resiimport_optimize
|
4 years ago |
|
jianjun
|
e0e715ef40
|
按照提示优化代码；尽量使用常量
|
4 years ago |
|
wangxianzhang
|
018c49264f
|
调整开发环境jvm内存参数
|
4 years ago |
|
wangxianzhang
|
0a0f7b3367
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
|
zhaoqifeng
|
a9c5cb4987
|
获取小区，楼栋，单元ID
|
4 years ago |
|
wangxianzhang
|
f7c5e8ceb6
|
修改：
1.居民信息导入：将类别变更数据放到redis中，减少内存占用
|
4 years ago |
