sunyuchao
|
4258c2c9da
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
7c90842153
|
bug修改
|
5 years ago |
jianjun
|
602cc39851
|
升级user
|
5 years ago |
|
jianjun
|
6073837fc4
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
f0ffee8b74
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
yinzuomei
|
82afe6b538
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
jianjun
|
1728eb0f6c
|
恢复代码并升级user
|
5 years ago |
|
yinzuomei
|
5023aeab49
|
heart+1
|
5 years ago |
wangchao
|
239c3e499f
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
311079bf8a
|
用户缓存更新补充
|
5 years ago |
zxc
|
9e4bbb1672
|
微信第三方平台-thirdOpenFeign删除
|
5 years ago |
zhangyongzhangyong
|
86d164dbc8
|
活动详情，增加返回字段-用户是否已报名活动
|
5 years ago |
|
yinzuomei
|
73fdfc916b
|
heart+1
|
5 years ago |
|
yinzuomei
|
70eb3079f5
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
yinzuomei
|
34fd7a3642
|
historicalact接口修改
|
5 years ago |
|
jianjun
|
6662004736
|
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 |
|
sunyuchao
|
acb6143edc
|
添加方法
|
5 years ago |
|
jianjun
|
fd935891f0
|
校验手机号客户内唯一
|
5 years ago |
|
sunyuchao
|
4beb510181
|
第三方整体调整-服务升级
|
5 years ago |
|
sunyuchao
|
ad2fbb2d22
|
公众号部分接口调整
|
5 years ago |
|
sunyuchao
|
cf23addc6c
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
yinzuomei
|
e19f4d2ae9
|
heart+1
|
5 years ago |
|
yinzuomei
|
c49e6f8b41
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
yinzuomei
|
c8063455e7
|
historicalact接口修改
|
5 years ago |
|
zhangyongzhangyong
|
426b339e49
|
活动报名接口修改
|
5 years ago |
zhaoqifeng
|
3ad467d9ef
|
党员认证bug修改
|
5 years ago |
|
zxc
|
1278e53063
|
微信第三方平台-创建机关、我得信息添加数据来源
|
5 years ago |
|
jianjun
|
505191b272
|
部署user
|
5 years ago |
|
jianjun
|
156a4c8d84
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
ad70abd3e6
|
部署user
|
5 years ago |
|
jianjun
|
0393fed982
|
Merge remote-tracking branches 'remotes/origin/dev_heart' and 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
jianjun
|
ce73071701
|
修改错误 获取role时添加app参数
|
5 years ago |
|
sunyuchao
|
292ea6c65b
|
公众号wxcodetotken接口调整
|
5 years ago |
|
zhangyongzhangyong
|
3c233719ff
|
志愿者补充提交
|
5 years ago |
|
zhangyongzhangyong
|
ee039c628b
|
志愿者信息查询
|
5 years ago |
|
sunyuchao
|
447186c996
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
zxc
|
15f45579df
|
微信第三方平台-类型转换修改
|
5 years ago |
|
sunyuchao
|
9d5d961526
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
02f6d40618
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
yinzuomei
|
c89882fc86
|
heart+1
|
5 years ago |
|
zxc
|
8353234e99
|
微信第三方平台-feign修改http
|
5 years ago |
|
yinzuomei
|
24b460ee92
|
heart:新增act_grant_point_log
|
5 years ago |
|
jianjun
|
1ffa79c967
|
升级commonservice，point
|
5 years ago |
|
jianjun
|
9cbd786d5e
|
Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
|
5 years ago |
|
sunyuchao
|
43164fa113
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
jianjun
|
88f4c6a3bf
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
jianjun
|
1ffc104028
|
添加脚本
|
5 years ago |
|
zhaoqifeng
|
868db9c798
|
调第三方feign改成HTTP Client
|
5 years ago |
|
wangchao
|
b8ffd3cb26
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
08995f4d66
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
# Conflicts:
# epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
|
5 years ago |
