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 | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e41cf5a506
								
							
								
							
						 | 
						
							
							
								
								- 优化居民导入
							
							
							
							
							
							
								
							
							
							- 优化日志切面打印,增加对MultipartFile类型的过滤 
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a9c5cb4987
								
							
								
							
						 | 
						
							
							
								
								获取小区,楼栋,单元ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f7c5e8ceb6
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.居民信息导入:将类别变更数据放到redis中,减少内存占用 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c428e8ea88
								
							
								
							
						 | 
						
							
							
								
								网格员数据上报接口上传的数据pids是从三个街道开始的,需要在前边拼上平阴县的组织id才可以  again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								aead0d2d02
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								a5db5669c0
								
							
								
							
						 | 
						
							
							
								
								党员风采列表倒序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1414888249
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be3c7dc372
								
							
								
							
						 | 
						
							
							
								
								添加参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								38397a605a
								
							
								
							
						 | 
						
							
							
								
								房屋导入暂提
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								05e0c1b1b9
								
							
								
							
						 | 
						
							
							
								
								dynamicQuery up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e48d7921e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								34ad1bb265
								
							
								
							
						 | 
						
							
							
								
								统计服务升级-获取项目节点耗时信息SQL改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a65836ba1b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								20b5defc53
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c082ebafe4
								
							
								
							
						 | 
						
							
							
								
								获取项目节点耗时信息SQL改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4922ee5707
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.居民信息导入:将数据分多批次导入,减少内存占用 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								444c837fdc
								
							
								
							
						 | 
						
							
							
								
								9999替换为统一错误码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f9ef9e267e
								
							
								
							
						 | 
						
							
							
								
								房屋信息导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ebe86ea47a
								
							
								
							
						 | 
						
							
							
								
								程序优化 again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2d968abc13
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								57e040415b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_lively_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b3432601c3
								
							
								
							
						 | 
						
							
							
								
								程序优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fa0058664b
								
							
								
							
						 | 
						
							
							
								
								导入去掉图片
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f50aa552b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_lively_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c946e16237
								
							
								
							
						 | 
						
							
							
								
								查询条件调整,按dateId筛选数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9057033ef0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5d54b5effd
								
							
								
							
						 | 
						
							
							
								
								党员风采导入导出添加所属分类名称
							
							
							
							
								
							
							
						 | 
						4 years ago |