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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
								
							
								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 | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c082ebafe4
								
							
								
							
						 | 
						
							
							
								
								获取项目节点耗时信息SQL改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4922ee5707
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.居民信息导入:将数据分多批次导入,减少内存占用 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								444c837fdc
								
							
								
							
						 | 
						
							
							
								
								9999替换为统一错误码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f9ef9e267e
								
							
								
							
						 | 
						
							
							
								
								房屋信息导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								57e040415b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_lively_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |