HAHA
							
						 | 
						
							
							
							
								
							
								d312746327
								
							
								
							
						 | 
						
							
							
								
								去掉id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ea8c9a1dbd
								
							
								
							
						 | 
						
							
							
								
								改bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2df56f947b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								49791964ff
								
							
								
							
						 | 
						
							
							
								
								党组织列表调整为只看显示本组织及下级党组织,不展示同级及上级;一级组织选项规则调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								111c5d4f59
								
							
								
							
						 | 
						
							
							
								
								去掉限制:活动报名截止时间应该大于当前时间
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e95c19daf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c0de8bd2b
								
							
								
							
						 | 
						
							
							
								
								居民信息表单,单选组件默认否
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								97e656bfdb
								
							
								
							
						 | 
						
							
							
								
								列表搜索党组织树(不包含当前级组织)
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b99e6bdb7c
								
							
								
							
						 | 
						
							
							
								
								事件@NoRepeatSubmit
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								917a95a7b6
								
							
								
							
						 | 
						
							
							
								
								工作端-新增家庭用户
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d519a2b340
								
							
								
							
						 | 
						
							
							
								
								【我的家庭】迁出家庭成员
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dcbe44bc83
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								48c2aa20ed
								
							
								
							
						 | 
						
							
							
								
								数字社区初始化居民信息表单,基础信息组件groupId 修改。
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								501379ad08
								
							
								
							
						 | 
						
							
							
								
								事件管理修改语音附件返参格式
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								c65eb4ee87
								
							
								
							
						 | 
						
							
							
								
								工作端-我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4368a90a13
								
							
								
							
						 | 
						
							
							
								
								居民是党员时,所属支部不能为空
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8a0710903c
								
							
								
							
						 | 
						
							
							
								
								居民是党员时,所属支部不能为空
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b1f15de803
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_sunjiatan'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								43320c8410
								
							
								
							
						 | 
						
							
							
								
								人员与房屋信息不匹配error code
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3b48960afb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d08df79822
								
							
								
							
						 | 
						
							
							
								
								根据身份证获取党员信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								30f5af785b
								
							
								
							
						 | 
						
							
							
								
								网格党建平面图 饼图,查询agency_pids
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								c48ec2b1bf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								24afd59423
								
							
								
							
						 | 
						
							
							
								
								修改量化积分修改时逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7ece978f44
								
							
								
							
						 | 
						
							
							
								
								根据身份证获取党员信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1662123073
								
							
								
							
						 | 
						
							
							
								
								根据身份证获取党员信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0200fcd5de
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d465503f58
								
							
								
							
						 | 
						
							
							
								
								社区自组织创建时间
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a2ce97f755
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_0608fix'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e24285e5bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_icservice'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fa104dd0e2
								
							
								
							
						 | 
						
							
							
								
								/residemand/mydemand
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								93ba905d12
								
							
								
							
						 | 
						
							
							
								
								bug修复˚
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7e5f828fdf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_sunjiatan'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b900eab931
								
							
								
							
						 | 
						
							
							
								
								联建单位删除是,如果存在未完成的需求不能删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c1d3e8cf47
								
							
								
							
						 | 
						
							
							
								
								绑定房屋逻辑修改,不添加ic_resi_user信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ee5ecdf20d
								
							
								
							
						 | 
						
							
							
								
								bug修复˚
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3b675b4c68
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_sunjiatan'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7ecdf061df
								
							
								
							
						 | 
						
							
							
								
								绑定房屋逻辑修改,不添加ic_resi_user信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								c5c2ce5d78
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_zz_wgh'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								8ddadd948e
								
							
								
							
						 | 
						
							
							
								
								修改逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								83c5fb3a0e
								
							
								
							
						 | 
						
							
							
								
								bug修复˚
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								9b0e939ad7
								
							
								
							
						 | 
						
							
							
								
								新增排序字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d1f90696dd
								
							
								
							
						 | 
						
							
							
								
								添加排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								05539623eb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/stat_bak'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								6f8dab6bf6
								
							
								
							
						 | 
						
							
							
								
								家庭成员详情为空处理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b2ae5d0206
								
							
								
							
						 | 
						
							
							
								
								删除社区自组织时存在未完成的服务不能删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								daedfe7827
								
							
								
							
						 | 
						
							
							
								
								批量生成一户一码地址及房屋编码传参调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c7c4b00710
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_sunjiatan'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b8f6e82ca0
								
							
								
							
						 | 
						
							
							
								
								绑定房屋bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b4fb28d1e0
								
							
								
							
						 | 
						
							
							
								
								单独分出组织查询功能
							
							
							
							
								
							
							
						 | 
						3 years ago |