sunyuchao
							
						 | 
						
							
							
							
								
							
								3f4110c7ed
								
							
								
							
						 | 
						
							
							
								
								事件管理主表新增工作端红点字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								88bb4aa599
								
							
								
							
						 | 
						
							
							
								
								人房统计查询数据排除无效组织、网格数据问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								11b9970b5f
								
							
								
							
						 | 
						
							
							
								
								配置定时任务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								62cf823c95
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_icservice' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_icservice
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								54746551bc
								
							
								
							
						 | 
						
							
							
								
								一户一档二维码地址调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								4c2a676557
								
							
								
							
						 | 
						
							
							
								
								小区统计修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								39a8afbbe2
								
							
								
							
						 | 
						
							
							
								
								小区统计修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								287f513c45
								
							
								
							
						 | 
						
							
							
								
								根据房屋编码获取房屋信息-优化提示
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								6489abb63b
								
							
								
							
						 | 
						
							
							
								
								小区统计修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								953a3d94af
								
							
								
							
						 | 
						
							
							
								
								二维码剔除字段;批量生成二维码及房屋编码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								1eecfcee1d
								
							
								
							
						 | 
						
							
							
								
								修改调用ruoyi逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6e68e3f05e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_icservice' into dev_icservice
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								be5d46c185
								
							
								
							
						 | 
						
							
							
								
								修复:【服务项目】服务人数从feedback中移动到服务记录表中
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2dd8565ab6
								
							
								
							
						 | 
						
							
							
								
								服务项目列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								c42c9d8f37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/stat_bak' into feature/stat_bak
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								b9c87a5028
								
							
								
							
						 | 
						
							
							
								
								小区统计修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								85492a25ef
								
							
								
							
						 | 
						
							
							
								
								增加定时任务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								171ccdac50
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/village_bak' into feature/stat_bak
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								c14734e1f3
								
							
								
							
						 | 
						
							
							
								
								根据房屋编码获取房屋信息补充customerId
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a7fb2d8862
								
							
								
							
						 | 
						
							
							
								
								area code补0
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7d24260527
								
							
								
							
						 | 
						
							
							
								
								sql脚本,新建房屋生成code和二维码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								9794fbcaff
								
							
								
							
						 | 
						
							
							
								
								家庭成员新增修改剔除中间表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								43634f14a6
								
							
								
							
						 | 
						
							
							
								
								sql脚本,新建房屋生成code和二维码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb8176d9b2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_zhili'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a9ced40803
								
							
								
							
						 | 
						
							
							
								
								多元主体分析-地图坐标
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d391d1dee5
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								003034ea4e
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1ac5429c3e
								
							
								
							
						 | 
						
							
							
								
								组织IDs接口修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8580bfd26d
								
							
								
							
						 | 
						
							
							
								
								字典表数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								54a919240d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0c89c9bc3b
								
							
								
							
						 | 
						
							
							
								
								..
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								058242d4d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								e0cf147fce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix_statistical'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								0f85367ff0
								
							
								
							
						 | 
						
							
							
								
								FIX
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1774c80520
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								eea4122606
								
							
								
							
						 | 
						
							
							
								
								人房数据统计排除迁出和死亡人员数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								804ede2303
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								f4420d4be4
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								ded7a4429c
								
							
								
							
						 | 
						
							
							
								
								家庭成员详情字段调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4073e3ccc1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								9f3b9805a0
								
							
								
							
						 | 
						
							
							
								
								get和set
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a01f100063
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								d674dd2360
								
							
								
							
						 | 
						
							
							
								
								家庭成员添加详细地址
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								73c32cebde
								
							
								
							
						 | 
						
							
							
								
								二维码添加参数
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d3f249a21a
								
							
								
							
						 | 
						
							
							
								
								流动人口详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								5a0151cb62
								
							
								
							
						 | 
						
							
							
								
								小区统计逻辑修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								e710197eeb
								
							
								
							
						 | 
						
							
							
								
								小区统计逻辑修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								1440688d27
								
							
								
							
						 | 
						
							
							
								
								小区统计逻辑修改(回滚)
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								3c4fb17f60
								
							
								
							
						 | 
						
							
							
								
								小区统计逻辑修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								652d998373
								
							
								
							
						 | 
						
							
							
								
								人口基本信息详情
							
							
							
							
								
							
							
						 | 
						3 years ago |