yinzuomei
							
						 | 
						
							
							
							
								
							
								1282e16cce
								
							
								
							
						 | 
						
							
							
								
								heart+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								32f7ce9b74
								
							
								
							
						 | 
						
							
							
								
								POINT   USER  服务更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d5bd3632ab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f62ed7c7ae
								
							
								
							
						 | 
						
							
							
								
								POINT   USER 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e59918c480
								
							
								
							
						 | 
						
							
							
								
								heart+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								4f02f36d60
								
							
								
							
						 | 
						
							
							
								
								活动即将开始,接口反参内容修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8e5dc0edb8
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
	epmet-module/epmet-point/epmet-point-server/pom.xml
	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
	epmet-module/epmet-third/epmet-third-server/pom.xml
	epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
	epmet-module/resi-mine/resi-mine-server/pom.xml
	epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
	epmet-user/epmet-user-server/pom.xml
	epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8276d59017
								
							
								
							
						 | 
						
							
							
								
								微信第三方平台-日志添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e7a8715178
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a94d9614d8
								
							
								
							
						 | 
						
							
							
								
								第三方版本更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ac2d0efa46
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								accacfd87a
								
							
								
							
						 | 
						
							
							
								
								mine  user   point 服务更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								304107ee21
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f9530c3768
								
							
								
							
						 | 
						
							
							
								
								积分bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								2a5df01844
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d530bef8c9
								
							
								
							
						 | 
						
							
							
								
								升级user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								530c640a93
								
							
								
							
						 | 
						
							
							
								
								升级user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4e4a764fb8
								
							
								
							
						 | 
						
							
							
								
								升级user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d5b5092fda
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								549d502fc8
								
							
								
							
						 | 
						
							
							
								
								heart+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								f923b9b908
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_heart' into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b5bddfcaf1
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								88c1cadb66
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								21b954ab75
								
							
								
							
						 | 
						
							
							
								
								活动回顾稿 - 接口修改,不加分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								85de534d1f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_heart' into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78972ac06d
								
							
								
							
						 | 
						
							
							
								
								联调bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								675cd406f3
								
							
								
							
						 | 
						
							
							
								
								部署user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								809a9249db
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b627bb3712
								
							
								
							
						 | 
						
							
							
								
								user_customer添加是否注册字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								94bdb7ea33
								
							
								
							
						 | 
						
							
							
								
								最新活动列表sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b663c28650
								
							
								
							
						 | 
						
							
							
								
								服务升级-公众号手机不能登陆问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2c03654630
								
							
								
							
						 | 
						
							
							
								
								gateway对于公众号服务不该传递token的不进行token校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1ddc453a43
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								8a011f3691
								
							
								
							
						 | 
						
							
							
								
								积分修改feign   版本+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b339cee0f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_heart' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bd9bfa5b44
								
							
								
							
						 | 
						
							
							
								
								resi-partyMember版本更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2fcf6bb6d2
								
							
								
							
						 | 
						
							
							
								
								我的积分修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7cca2c3de9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a860866ea5
								
							
								
							
						 | 
						
							
							
								
								查看自动审核失败详情失败修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a3c3ba463c
								
							
								
							
						 | 
						
							
							
								
								提交审核
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								da0b1e7f3a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3bd2e110ec
								
							
								
							
						 | 
						
							
							
								
								用户没有积分的时候 默认为0   积分服务版本+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a458480661
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0e11e7cc05
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_heart' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								e78b4316f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_heart' into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4c431ca4d5
								
							
								
							
						 | 
						
							
							
								
								公众号Bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								52d9711ffd
								
							
								
							
						 | 
						
							
							
								
								用户积分 默认为0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								76eabba598
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0e3d694079
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d0c9f9d424
								
							
								
							
						 | 
						
							
							
								
								首页组件-活动回顾列表接口
							
							
							
							
								
							
							
						 | 
						5 years ago |