wangchao
							
						 | 
						
							
							
							
								
							
								c2fc29611f
								
							
								
							
						 | 
						
							
							
								
								被调用的服务参数加@RequestBody
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3494dba942
								
							
								
							
						 | 
						
							
							
								
								党员认证添加消息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								60ff964c30
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d5ccb34eab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								549569f7b8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								893e39caf5
								
							
								
							
						 | 
						
							
							
								
								message模块不能调用外部服务
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								056fd8a89f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0ece1d1287
								
							
								
							
						 | 
						
							
							
								
								查询用户最后一次登陆的网格,sql修正
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dbea3a6e50
								
							
								
							
						 | 
						
							
							
								
								epmetMessage sendMsg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ffdfc0d51a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3c9ab7561f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								231e38f0ff
								
							
								
							
						 | 
						
							
							
								
								获取最近一次访问网格接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7bfcfa7773
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7d02b8827e
								
							
								
							
						 | 
						
							
							
								
								政府段群组相关 修改auidtting接口与Audited接口,查看话题加入分页
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d961c1a853
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govorg' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f050f025fc
								
							
								
							
						 | 
						
							
							
								
								版本升级:前端查询权限,增加all所有权限的条目
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								68e98e231e
								
							
								
							
						 | 
						
							
							
								
								版本升级:前端查询权限,增加all所有权限的条目
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4fc0aa5956
								
							
								
							
						 | 
						
							
							
								
								已认证党员列表逻辑顺序调整
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								262376815a
								
							
								
							
						 | 
						
							
							
								
								添加网格报错解决
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bdfcce663b
								
							
								
							
						 | 
						
							
							
								
								网格添加
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2fd1db04f8
								
							
								
							
						 | 
						
							
							
								
								修改获取pids查询字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ae95120eb2
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								606c5504e1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								128d8af30d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c11cd7221f
								
							
								
							
						 | 
						
							
							
								
								党员认证返回值修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								490262cf81
								
							
								
							
						 | 
						
							
							
								
								表单验证
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1afcdd705a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0a43f51285
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d48434d3a1
								
							
								
							
						 | 
						
							
							
								
								接口入参设置允许的最大字符数
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3eb15b78fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								60ce166a72
								
							
								
							
						 | 
						
							
							
								
								党员认证bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								55a067bb63
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d2e8515895
								
							
								
							
						 | 
						
							
							
								
								对前端传递参数最大字符数做限定
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3b1a4bb067
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8011789b8d
								
							
								
							
						 | 
						
							
							
								
								1.调整之后的DataFIlter
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								788c015787
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								727dbd7eae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								fddbe0efdd
								
							
								
							
						 | 
						
							
							
								
								居民创建群组,发送消息,更新消息字段到群组操作表中
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f1ff7be66b
								
							
								
							
						 | 
						
							
							
								
								8004错误提示信息:手机号未注册,请联系贵单位管理员,确认其录入手机与您所持手机号相同,添加网格发布服务
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fc3ee3a26c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								917fd4e8ae
								
							
								
							
						 | 
						
							
							
								
								8004错误提示信息:手机号未注册,请联系贵单位管理员,确认其录入手机与您所持手机号相同
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								df14ed0283
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								78ed117bf3
								
							
								
							
						 | 
						
							
							
								
								网格添加:添加地区编码修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								04649ee217
								
							
								
							
						 | 
						
							
							
								
								编辑人员bug修改,添加网格,地区编码bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7bba82cf2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								012a50a859
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cfdf7d7696
								
							
								
							
						 | 
						
							
							
								
								组织-工作人员编辑 bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a8c4f77272
								
							
								
							
						 | 
						
							
							
								
								网格添加:添加地区编码
							
							
							
							
							
							
								
							
							
							已认证党员详情:添加address字段 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7b2103111d
								
							
								
							
						 | 
						
							
							
								
								待审核党员列表接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b9c793aabb
								
							
								
							
						 | 
						
							
							
								
								gov org删除网格bug修复
							
							
							
							
								
							
							
						 | 
						6 years ago |