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 |
|
zhaoqifeng
|
85eed0ca99
|
获取小区，楼栋，单元ID
|
4 years ago |
|
sunyuchao
|
346b5dcdf7
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
zxc
|
d51f3f1fa8
|
房屋导入暂提
|
4 years ago |
|
sunyuchao
|
26936e18b1
|
网格员数据上报接口上传的数据pids是从三个街道开始的，需要在前边拼上平阴县的组织id才可以
|
4 years ago |
yinzuomei
|
7a75c8215f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
60659f66fc
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
yinzuomei
|
a5db5669c0
|
党员风采列表倒序
|
4 years ago |
|
zxc
|
1414888249
|
注释
|
4 years ago |
|
zhaoqifeng
|
be3c7dc372
|
添加参数
|
4 years ago |
|
zxc
|
38397a605a
|
房屋导入暂提
|
4 years ago |
|
yinzuomei
|
72a123152a
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
2e346ab5ef
|
是否
|
4 years ago |
|
zxc
|
11ff0e4433
|
id类型
|
4 years ago |
|
jianjun
|
3134a60805
|
主线程里创建子线程调用feign接口，通过header消息头带token信息方式
|
4 years ago |
|
zxc
|
c554be8b0b
|
房屋导入暂提
|
4 years ago |
|
yinzuomei
|
888419fe1e
|
dynamicQuery
|
4 years ago |
|
jianjun
|
6782ddd2b4
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_query
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
zxc
|
413af387af
|
fangwuID
|
4 years ago |
|
zxc
|
a03ca03f47
|
房屋ID
|
4 years ago |
|
zxc
|
55ba9b5b71
|
emm
|
4 years ago |
|
zxc
|
afbfb6cbf5
|
房屋导入通用DTO
|
4 years ago |
|
zhaoqifeng
|
20b5defc53
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
