|  jianjun | 85c399e974 | Merge remote-tracking branch 'remotes/origin/dev_icresiuser_pids' # Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java | 3 years ago | 
				
					
						|  sunyuchao | da711e9e87 | 禅道:http://zentao.elinkservice.cn/story-view-670.html 个人档案中上报事件模块相关接口由原来的查询resi_event改为查询ic_event表,市北客户继续沿用之前接口 | 3 years ago | 
				
					
						|  zhaoqifeng | f60ddbee1d | 家庭成员移除 | 3 years ago | 
				
					
						|  jianjun | 273d5b1df7 | 更新房屋内居民数据 | 3 years ago | 
				
					
						|  jianjun | 7ef08e2a73 | 更新房屋内居民数据 | 3 years ago | 
				
					
						|  jianjun | 89df790fd2 | 更新房屋内数据 | 3 years ago | 
				
					
						|  wanggongfeng | 616f548f63 | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago | 
				
					
						|  wangxianzhang | f11fddc5b2 | /resi-brief接口中对志愿者的查询,查不到字典不再抛出异常,而是打印error日志 | 3 years ago | 
				
					
						|  Jackwang | 0b83c27187 | 工作端/居民端-新增家庭成员添加变动记录 | 3 years ago | 
				
					
						|  sunyuchao | a0788727c8 | 只有经纬度取根组织的其他信息不变 | 3 years ago | 
				
					
						|  zxc | c1967b360b | emm | 3 years ago | 
				
					
						|  jianjun | b61c8e7690 | 1 | 3 years ago | 
				
					
						|  jianjun | 67b11d7d89 | Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_5big_coverage # Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml | 3 years ago | 
				
					
						|  zhangyuan | eaf642a7ab | 各类人员关联时加上客户ID | 3 years ago | 
				
					
						|  jianjun | 799ed4627b | 1 | 3 years ago | 
				
					
						|  jianjun | 48b93f729b | 防重复提交 token为空则直接跳过 | 3 years ago | 
				
					
						|  yinzuomei | 9a6f304952 | jign经度纬度 | 3 years ago | 
				
					
						|  zxc | f600955f76 | 社区自组织防重复提交去除 | 3 years ago | 
				
					
						|  wangxianzhang | 0f97b84f5e | 【疫苗接种】修复疫苗接种&&核酸检测关注列表中数据重复问题(因为查询没加customerId查询,不同客户下身份证允许重复) | 3 years ago | 
				
					
						|  yinzuomei | bbfd8e7b99 | Merge remote-tracking branch 'origin/master' | 3 years ago | 
				
					
						|  yinzuomei | 42dcc52e7d | Merge remote-tracking branch 'origin/dev_bugfix_ljj' # Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java | 3 years ago | 
				
					
						|  YUJT | 7840128226 | Merge branch 'feature/dev_zz_wgh' | 3 years ago | 
				
					
						|  HAHA | d906238871 | 修改逻辑 | 3 years ago | 
				
					
						|  yinzuomei | 94c94694b2 | /userdemand/category-analysis | 3 years ago | 
				
					
						|  wanggongfeng | cd335431fe | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago | 
				
					
						|  yinzuomei | 06374f9283 | serviceShowName | 3 years ago | 
				
					
						|  wangxianzhang | a7722fdab1 | 【五大图层】数据查询,如果不分页,则只返回类别和坐标数据,不返回相应的name | 3 years ago | 
				
					
						|  wanggongfeng | 3ac41ae49d | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago | 
				
					
						|  yinzuomei | 21064837a3 | DemandAnalysisLegendEnum | 3 years ago | 
				
					
						|  yinzuomei | 0505c83b1d | 数据分析-服务措施分析-柱状图 | 3 years ago | 
				
					
						|  yinzuomei | b5b1eebd5e | =null | 3 years ago | 
				
					
						|  zxc | 81ddfaf9f3 | 人名赋值 | 3 years ago | 
				
					
						|  yinzuomei | 44e57b9f8e | 暂存别上生产。3 | 3 years ago | 
				
					
						|  HAHA | d0138dcaaf | 修改剩余部分 | 3 years ago | 
				
					
						|  HAHA | 06c5265351 | 修改部分 | 3 years ago | 
				
					
						|  wanggongfeng | 45cd47b2d1 | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago | 
				
					
						|  yinzuomei | 80fd38fa0d | 暂存别上生产。2 | 3 years ago | 
				
					
						|  HAHA | e18b2e8798 | 修改逻辑 | 3 years ago | 
				
					
						|  wanggongfeng | 66750e9e9f | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago | 
				
					
						|  zhaoqifeng | e592875119 | sql脚本 | 3 years ago | 
				
					
						|  sunyuchao | e4366a51c8 | 图层字典表数据初始化加入数字平台客户初始化中 | 3 years ago | 
				
					
						|  sunyuchao | 8304a32c3f | 图层字典表数据初始化加入数字平台客户初始化中 | 3 years ago | 
				
					
						|  yinzuomei | c4cebaab34 | 暂存别上生产。 | 3 years ago | 
				
					
						|  YUJT | 0b813fb5de | Merge branch 'feature/dev_zz_wgh' | 3 years ago | 
				
					
						|  YUJT | ec564fac96 | update | 3 years ago | 
				
					
						|  YUJT | 1bae9370ec | Merge branch 'feature/dev_zz_wgh' | 3 years ago | 
				
					
						|  YUJT | 3c36ee6010 | 添加flyway脚本 | 3 years ago | 
				
					
						|  yinzuomei | 28ff0d820b | 指派给志愿者,查询的是居民信息里的志愿者信息 | 3 years ago | 
				
					
						|  zhaoqifeng | 6235f0241e | 家庭成员迁出修改 | 3 years ago | 
				
					
						|  wanggongfeng | d4d92ec092 | 疫苗接种点,核酸检测点 pc 管理 | 3 years ago |