yinzuomei
							
						 | 
						
							
							
							
								
							
								f243849a3c
								
							
								
							
						 | 
						
							
							
								
								切换网格初始提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a3c60823e9
								
							
								
							
						 | 
						
							
							
								
								修改 获取最近一次登录的客户信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								95dad66035
								
							
								
							
						 | 
						
							
							
								
								修改 获取最近一次登录的客户信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c55ca2d106
								
							
								
							
						 | 
						
							
							
								
								修改 获取最近一次登录的客户信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c7c2ce05be
								
							
								
							
						 | 
						
							
							
								
								customer_agency表添加字段对应实体添加属性字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6fa3ed19b8
								
							
								
							
						 | 
						
							
							
								
								1.修改pom版本
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4c29ed52a7
								
							
								
							
						 | 
						
							
							
								
								1.新增:查询客户footbar接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6f57c14b09
								
							
								
							
						 | 
						
							
							
								
								1.gov-access和gov-mine微服务调整,修复错误
							
							
							
							
							
							
								
							
							
							2.将新服务增加到gateway中 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fafe406379
								
							
								
							
						 | 
						
							
							
								
								1.解决对client重复依赖冲突
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								46c6b40134
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4e4c0700bf
								
							
								
							
						 | 
						
							
							
								
								1.gov—mine和gov-access微服务错误修复
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								455d84210d
								
							
								
							
						 | 
						
							
							
								
								获取最近一次登录的客户信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								74af1354c6
								
							
								
							
						 | 
						
							
							
								
								获取最近一次登录的客户信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9bcd561b56
								
							
								
							
						 | 
						
							
							
								
								customer_agency表添加字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								56980799b5
								
							
								
							
						 | 
						
							
							
								
								根据userId查询网格列表
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								93e5db24f7
								
							
								
							
						 | 
						
							
							
								
								模板代码提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a8b3c3653c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b0b8ecb4fa
								
							
								
							
						 | 
						
							
							
								
								gov-mine服务模板文件提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fd00986a70
								
							
								
							
						 | 
						
							
							
								
								1.db脚本补充
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d521b63fa6
								
							
								
							
						 | 
						
							
							
								
								1.db脚本补充
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								794f3f0d3f
								
							
								
							
						 | 
						
							
							
								
								1.新增epmet-user,gov-access,oper-customize db脚本
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								10b427ed2f
								
							
								
							
						 | 
						
							
							
								
								1.新增gov-mine服务模块
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3e3a462487
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java
#	epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f6da4109b3
								
							
								
							
						 | 
						
							
							
								
								楼院小组redis的get操作修改,缓存、数据库全流程封装,其余服务只需调用即可。政府端接口①待审核的小组列表②审核小组的详情(包含已审核与未审核)③同意建组申请④驳回建组申请。在resi-guide模块加上snakeYaml依赖解决bootstrap.yml无法试别@的问题。
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d85b33f637
								
							
								
							
						 | 
						
							
							
								
								删除ErrorCode
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b978ffc448
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								022bf25985
								
							
								
							
						 | 
						
							
							
								
								1.调整拦截TokenDto Filter的逻辑
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1314211d39
								
							
								
							
						 | 
						
							
							
								
								微信小程序id修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9e1420af15
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d551b175f9
								
							
								
							
						 | 
						
							
							
								
								1.调整拦截TokenDto Filter的逻辑,增加BaseTokenDto
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								142dead6b2
								
							
								
							
						 | 
						
							
							
								
								选择组织,进入首页入参Dto修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fd166da964
								
							
								
							
						 | 
						
							
							
								
								orgId改为agencyId
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								02ab6e9e62
								
							
								
							
						 | 
						
							
							
								
								找回@LoginUser
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6ecf864936
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c80183c7cd
								
							
								
							
						 | 
						
							
							
								
								暂存1
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								278fbb4f21
								
							
								
							
						 | 
						
							
							
								
								党员自动认证规则修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0b50a182f3
								
							
								
							
						 | 
						
							
							
								
								1.CustomerDepartment中的字段org_id改为agency_id
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e51b747bc2
								
							
								
							
						 | 
						
							
							
								
								1.新增gov-access模块
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								07b9eca3bc
								
							
								
							
						 | 
						
							
							
								
								合并dev分支
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								24b5f1b727
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								106382199c
								
							
								
							
						 | 
						
							
							
								
								删除staff_login_history表,创建staff_agency_history
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0919eb7a45
								
							
								
							
						 | 
						
							
							
								
								/loginwxmp/getmyorg接口开发
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b05fb2a12b
								
							
								
							
						 | 
						
							
							
								
								删除staff_login_history,改为staff_agency_history
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								aa2c0d1ab7
								
							
								
							
						 | 
						
							
							
								
								删除staff_login_history,改为staff_agency_history
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								84614c5a14
								
							
								
							
						 | 
						
							
							
								
								赞提
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4b1c51c2fc
								
							
								
							
						 | 
						
							
							
								
								1.修改customer_staff_agency.org_id为agency_id
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f7ada07fb3
								
							
								
							
						 | 
						
							
							
								
								1.修改customer_staff_agency.org_id为agency_id
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								dfa93ecb9e
								
							
								
							
						 | 
						
							
							
								
								添加 本网格的小组和小组管理界面信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3d2c935228
								
							
								
							
						 | 
						
							
							
								
								getCustomerStaffInfo修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								db83b28be0
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago |