zxc
							
						 | 
						
							
							
							
								
							
								0761b375de
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d93acd747f
								
							
								
							
						 | 
						
							
							
								
								全网发布
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7d461160eb
								
							
								
							
						 | 
						
							
							
								
								用户升级   112
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								99cece3519
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4ee98e4b69
								
							
								
							
						 | 
						
							
							
								
								缓存修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b121532f1d
								
							
								
							
						 | 
						
							
							
								
								校验 活动报名截止时间应该大于当前时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f8fef3cf9f
								
							
								
							
						 | 
						
							
							
								
								用户更新   111
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								beea1a8c40
								
							
								
							
						 | 
						
							
							
								
								已报名人员列表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								643d7e6212
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								179d1f4530
								
							
								
							
						 | 
						
							
							
								
								用户缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f54f3b65e4
								
							
								
							
						 | 
						
							
							
								
								升级heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								dadab8a087
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								7fc075eb5c
								
							
								
							
						 | 
						
							
							
								
								工作端:已报名列表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								81967ea068
								
							
								
							
						 | 
						
							
							
								
								全网发布
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								57755e68d3
								
							
								
							
						 | 
						
							
							
								
								公众号消息推送接口添加注释,小程序授权完成添加发送钉钉消息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								34ac200702
								
							
								
							
						 | 
						
							
							
								
								活动列表,报名人数统计:包含未审核、审核通过-heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d171ee62fb
								
							
								
							
						 | 
						
							
							
								
								活动列表,报名人数统计:包含未审核、审核通过
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf7e22b87f
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								16337acade
								
							
								
							
						 | 
						
							
							
								
								闲置代码清除
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								33c448bd6e
								
							
								
							
						 | 
						
							
							
								
								govvoice+1,=>68
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								207fd8ac8e
								
							
								
							
						 | 
						
							
							
								
								修改selectDraftContentDetail、selectDraftAttr这两个sql,去除原来的值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								50d71ad639
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e06aea4c4
								
							
								
							
						 | 
						
							
							
								
								添加公众号消息推送的post方式
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2988d8d56e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ba37088a35
								
							
								
							
						 | 
						
							
							
								
								添加公众号消息推送的post方式
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2266990859
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3763171721
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f976f9e26a
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3c395a6024
								
							
								
							
						 | 
						
							
							
								
								积分脚本修改  服务更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								896df53aaf
								
							
								
							
						 | 
						
							
							
								
								积分数据库脚本更改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								ab0e4f0080
								
							
								
							
						 | 
						
							
							
								
								积分    用户    更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a37ac90b71
								
							
								
							
						 | 
						
							
							
								
								积分调整:查询用户详情信息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								acc6adcc84
								
							
								
							
						 | 
						
							
							
								
								加急,设置域名,已设置类目,基本信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								788c1b4024
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								25f142eeb4
								
							
								
							
						 | 
						
							
							
								
								积分核销时积分不能为空
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0d184276b0
								
							
								
							
						 | 
						
							
							
								
								user+1 -> 35    user+1 -> 109
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c1634267b8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d9becf97e9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								227441b808
								
							
								
							
						 | 
						
							
							
								
								新增清除用户缓存的接口 epmet/userbaseinfo/clearusercache
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								88d2652364
								
							
								
							
						 | 
						
							
							
								
								积分核销的结果失效期设置为十分钟,用户基础信息缓存失效期设置为七天
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								56b3bc4188
								
							
								
							
						 | 
						
							
							
								
								flyway.enabledxiugai
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45763bcf94
								
							
								
							
						 | 
						
							
							
								
								体验版服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								541139fb0d
								
							
								
							
						 | 
						
							
							
								
								130heart42
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9201a8ac66
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_heart' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dba5dfc1d9
								
							
								
							
						 | 
						
							
							
								
								130,heart\point+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e35be4e1e9
								
							
								
							
						 | 
						
							
							
								
								体验版:heart=>41
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9cf9006de0
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								38dbec1173
								
							
								
							
						 | 
						
							
							
								
								130:heart=>41
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a0d4a35939
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf236e9ee5
								
							
								
							
						 | 
						
							
							
								
								报名条件不必填,如果没有填写默认无
							
							
							
							
								
							
							
						 | 
						5 years ago |