wangchao
							
						 | 
						
							
							
							
								
							
								f9bec86c6b
								
							
								
							
						 | 
						
							
							
								
								UserAccessService
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d23c8ffc93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								19aa824bc6
								
							
								
							
						 | 
						
							
							
								
								添加党员认证、热心居民申请端访问权限控制
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e7b982a9d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								53a28d326a
								
							
								
							
						 | 
						
							
							
								
								新增initapplycreategroup接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								aa52648f60
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								21062aeea6
								
							
								
							
						 | 
						
							
							
								
								enterGrid相关
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								89e0e1ddd6
								
							
								
							
						 | 
						
							
							
								
								实体DTO字段名修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								94e6274613
								
							
								
							
						 | 
						
							
							
								
								根据app、用户Id、客户Id查询用户的角色列表。
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5e1f5d4062
								
							
								
							
						 | 
						
							
							
								
								居民注册页面初始化注册访问记录表新增数据接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								391ad82af0
								
							
								
							
						 | 
						
							
							
								
								loginByWxCode、loginByPassword接口修改,删除customer_user相关代码
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9956a4cd5f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5fbd3029e2
								
							
								
							
						 | 
						
							
							
								
								用户entergrid
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								59cce5e2e2
								
							
								
							
						 | 
						
							
							
								
								resi-group新增initapplygroup接口,epmet-user新增根据客户id、用户id查询居民注册信息接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d57edceed1
								
							
								
							
						 | 
						
							
							
								
								居民热心居民党员业务代码生成
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1be49682d5
								
							
								
							
						 | 
						
							
							
								
								实现group部分接口,新增我的消息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3d857c5dbf
								
							
								
							
						 | 
						
							
							
								
								auth的userFeign去掉url
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								764615519b
								
							
								
							
						 | 
						
							
							
								
								居民用户微信登录接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5e1f0b7c67
								
							
								
							
						 | 
						
							
							
								
								修改运营端登录接口,居民用户微信登录接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c0428dc9fd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e59f3077ed
								
							
								
							
						 | 
						
							
							
								
								新增resi-group,resi-partymember
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30f9bc2e0f
								
							
								
							
						 | 
						
							
							
								
								demo模块修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b450c442f6
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								79599584d3
								
							
								
							
						 | 
						
							
							
								
								redis连接改为10.10.10.77
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								abf0965b54
								
							
								
							
						 | 
						
							
							
								
								命名规范修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9863e1ca0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a9f93217c4
								
							
								
							
						 | 
						
							
							
								
								登陆bug修改,获取网格信息bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								76b609a6b7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								27ceea8e02
								
							
								
							
						 | 
						
							
							
								
								gateway pom.xml
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0684996bdd
								
							
								
							
						 | 
						
							
							
								
								ResiMineGridController入口改为mygrid
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								494f978601
								
							
								
							
						 | 
						
							
							
								
								gateway修改resimine服务地址
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								43f2b0f5c1
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								22007969eb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								56a5ddb7af
								
							
								
							
						 | 
						
							
							
								
								FeignClient去掉url
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d8d86efa14
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
	epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								12f23a770b
								
							
								
							
						 | 
						
							
							
								
								新增resi-mine
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								8b7d8f37a7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4276d44c19
								
							
								
							
						 | 
						
							
							
								
								FeignClient去掉url
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								caec4b9e8f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev1.0' into dev1.0
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
#	epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								65dea28661
								
							
								
							
						 | 
						
							
							
								
								新增修改数据方法
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c4cd37bca8
								
							
								
							
						 | 
						
							
							
								
								oper-access的pom.xml去掉多余注释
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								207b180398
								
							
								
							
						 | 
						
							
							
								
								resi-guide陌生人查询附近网格信息部分代码规范调整,将本地开发环境的redis库连接到远程主机10.10.10.79:6379
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								73e7898bb7
								
							
								
							
						 | 
						
							
							
								
								漏提代码
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								11a9c209c4
								
							
								
							
						 | 
						
							
							
								
								代码Review之后的修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								hosinokamui
							
						 | 
						
							
							
							
								
							
								1064b9d9c5
								
							
								
							
						 | 
						
							
							
								
								release问题修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7508f837c3
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								63e879d1c1
								
							
								
							
						 | 
						
							
							
								
								新增首页组件管理
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								hosinokamui
							
						 | 
						
							
							
							
								
							
								e25b2207f5
								
							
								
							
						 | 
						
							
							
								
								菜单增删改查修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bf6b50967f
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fcb5b8ba6b
								
							
								
							
						 | 
						
							
							
								
								陌生人导览获取首页配置sql语句添加排序字段
							
							
							
							
								
							
							
						 | 
						6 years ago |