yinzuomei
							
						 | 
						
							
							
							
								
							
								0d5945a253
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6aa404deda
								
							
								
							
						 | 
						
							
							
								
								议题表决添加防重
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d95c5e0109
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3bc6e081f6
								
							
								
							
						 | 
						
							
							
								
								icEventxxxcx默认0
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5bdf0b3715
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								fb10bd3469
								
							
								
							
						 | 
						
							
							
								
								改一些字段问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d83b37d059
								
							
								
							
						 | 
						
							
							
								
								未匹配到分类的默认是其他
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								01f7b07f25
								
							
								
							
						 | 
						
							
							
								
								agency指的是社区
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								64fb468cf2
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_change_communitySelfOrganization' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_change_communitySelfOrganization
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8b3945f113
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_checksetting_brefore_audit'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3417f431ad
								
							
								
							
						 | 
						
							
							
								
								微信小程序提审前校验并设置用户隐私设置
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								cd79bec6d5
								
							
								
							
						 | 
						
							
							
								
								居民信息导入,从表去掉REMARKS字段insert,防止报错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a92ee36a15
								
							
								
							
						 | 
						
							
							
								
								居民信息导入,查询remote数据的时候先判断,没填就不查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								7d4cfa2873
								
							
								
							
						 | 
						
							
							
								
								补充controller
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								93a42261c8
								
							
								
							
						 | 
						
							
							
								
								不继承,补充拉取数据街道办的代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								876335346b
								
							
								
							
						 | 
						
							
							
								
								合并sunjiatan到master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9176a251e4
								
							
								
							
						 | 
						
							
							
								
								发下开发试试吧
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								c90d157626
								
							
								
							
						 | 
						
							
							
								
								修改dto字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d25b1c96cf
								
							
								
							
						 | 
						
							
							
								
								申请积分,总分查询接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								03d66d3774
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi系统获取wgh_yqhjz数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ff15abcc87
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi系统获取wgh_yjbmcs数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								db60d01170
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi系统获取wgh_whpdw数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								b7f1a8d7dd
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取wgh_szzrwg数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ecc0a46eb5
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi系统获取wgh_szcgwgh数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								75f1896054
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取wgh_sqxx数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								faeb74750e
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取wgh_sjxx数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6a9cab1532
								
							
								
							
						 | 
						
							
							
								
								backmore
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3dc38ceae2
								
							
								
							
						 | 
						
							
							
								
								back
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								58b720b18a
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取wgh_jyz数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c2d7289a42
								
							
								
							
						 | 
						
							
							
								
								try
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								11278a4c1c
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口存储wgh_jxcs数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9b92a536c1
								
							
								
							
						 | 
						
							
							
								
								拉去了一下master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a1d9c6b677
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_change_communitySelfOrganization' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_change_communitySelfOrganization
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								e0027535a0
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口存储wgh_jqz数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d068f4eca5
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								c8df11700b
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取wgh_jdb数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								33b73c6312
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口获取dywg数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ff2e388156
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi接口存储社区数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								396abb2a4b
								
							
								
							
						 | 
						
							
							
								
								新增家庭成员添加更新信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								afe087b97e
								
							
								
							
						 | 
						
							
							
								
								注释社区自组织成员联系方式格式校验
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								de9a7bdc23
								
							
								
							
						 | 
						
							
							
								
								调用ruoyi存储bm_grid数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								ac6f31a40c
								
							
								
							
						 | 
						
							
							
								
								新增家庭成员添加更新信息-添加调动记录-补充staffId字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								bd42f45bf0
								
							
								
							
						 | 
						
							
							
								
								代码生成,调用ruoyi拿取BaseGrid数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								f41c67f2f2
								
							
								
							
						 | 
						
							
							
								
								新增家庭成员添加更新信息-添加调动记录-补充客户id字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								cd9eaf8951
								
							
								
							
						 | 
						
							
							
								
								新增家庭成员添加更新信息-添加调动记录
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								88d0249405
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9efd285737
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d330fbb123
								
							
								
							
						 | 
						
							
							
								
								社区自组织导入error
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c054cc35ed
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8ce8a1ab82
								
							
								
							
						 | 
						
							
							
								
								画区域时也可以同时更新经纬度 正则校验
							
							
							
							
								
							
							
						 | 
						3 years ago |