yinzuomei
							
						 | 
						
							
							
							
								
							
								f9bbcb5605
								
							
								
							
						 | 
						
							
							
								
								修改房屋,删除房屋缓存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1459a2b36d
								
							
								
							
						 | 
						
							
							
								
								房屋管理左侧树排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3575b1f2f9
								
							
								
							
						 | 
						
							
							
								
								sort
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f9d4b2c406
								
							
								
							
						 | 
						
							
							
								
								房屋管理左侧树排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9a82f4a645
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								747ba74425
								
							
								
							
						 | 
						
							
							
								
								listresi排序调整1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								47daf2a736
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								274212eca1
								
							
								
							
						 | 
						
							
							
								
								返回支持添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ac71a67c31
								
							
								
							
						 | 
						
							
							
								
								居民防疫信息排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf48aef8b6
								
							
								
							
						 | 
						
							
							
								
								listresi排序调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								47623547b2
								
							
								
							
						 | 
						
							
							
								
								返回支持添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								51cb74e77f
								
							
								
							
						 | 
						
							
							
								
								信息采集详情
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f810d5f819
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								59770de0cb
								
							
								
							
						 | 
						
							
							
								
								只合并改合并的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cd81ac7b6a
								
							
								
							
						 | 
						
							
							
								
								url
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								58093e0b03
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								7b9300be4c
								
							
								
							
						 | 
						
							
							
								
								居民信息导入的时候,对datapicker和datarange空间的内容进行正则解析判断,和格式转换
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								95ace290f7
								
							
								
							
						 | 
						
							
							
								
								隐藏列原始值加密
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4303f3cc64
								
							
								
							
						 | 
						
							
							
								
								do语句被短路
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								49d92147ad
								
							
								
							
						 | 
						
							
							
								
								添加设置列宽策略
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c6b32326fd
								
							
								
							
						 | 
						
							
							
								
								楼栋,房屋列表新增倒序正序传参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1caf1b9244
								
							
								
							
						 | 
						
							
							
								
								楼栋,房屋列表新增倒序正序传参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d4d995e2eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								929aea9565
								
							
								
							
						 | 
						
							
							
								
								获取需求分类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eb9ce1cb89
								
							
								
							
						 | 
						
							
							
								
								楼栋修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d036bad723
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_import_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8a81223eb6
								
							
								
							
						 | 
						
							
							
								
								模板修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0c17491316
								
							
								
							
						 | 
						
							
							
								
								个人档案-家庭关系bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								705ba77687
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d2af1fb1d
								
							
								
							
						 | 
						
							
							
								
								居民信息列表导出增加ic_resi_user.id desc
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ae6746dbdd
								
							
								
							
						 | 
						
							
							
								
								楼栋导出添加 楼长信息,新增修改sort接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								27a9f00ab0
								
							
								
							
						 | 
						
							
							
								
								=60岁的也是老年人
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c7adc6c71e
								
							
								
							
						 | 
						
							
							
								
								导入修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d5e952e4b2
								
							
								
							
						 | 
						
							
							
								
								房屋排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d0bc110a56
								
							
								
							
						 | 
						
							
							
								
								房屋排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								df919f5121
								
							
								
							
						 | 
						
							
							
								
								楼栋排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								cf126e6f6d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'back_contract' into back
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								59481feec8
								
							
								
							
						 | 
						
							
							
								
								更改附件实体类的字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								45f814c3b0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'back_contract' into back
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								bc683f5f85
								
							
								
							
						 | 
						
							
							
								
								更新接收tokendto
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b818dec118
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into back
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d49fdf513a
								
							
								
							
						 | 
						
							
							
								
								修改密码接口 修改app
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2c8c91433b
								
							
								
							
						 | 
						
							
							
								
								修改密码接口 修改方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bb7b791dd7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ec3981e40a
								
							
								
							
						 | 
						
							
							
								
								修改密码接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								77db6d47ef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into back
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bac2917190
								
							
								
							
						 | 
						
							
							
								
								应前端要求 接口入参不再传appId值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2da0272b44
								
							
								
							
						 | 
						
							
							
								
								添加动力主轴服务 2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								199416f7c6
								
							
								
							
						 | 
						
							
							
								
								添加动力主轴服务
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								af2b12cd31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'back' of http://121.42.41.42:7070/r/epmet-cloud into back
							
							
							
							
								
							
							
						 | 
						4 years ago |