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 |
wxz
|
361d7ecb88
|
版本升级
|
5 years ago |
|
wxz
|
74deee8363
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
0d4df40f0c
|
Merge branches 'master' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
|
5 years ago |
|
wxz
|
b6198dfd31
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
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 |
|
wxz
|
627032bc2e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
jianjun
|
6b6c0c6bcb
|
部署org，party user
|
5 years ago |
|
jianjun
|
424754424d
|
Merge branch 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
|
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 |
|
wangchao
|
4bf054bc38
|
resimine 版本号+1
|
5 years ago |
|
jianjun
|
1bcc6bb266
|
部署org
|
5 years ago |
|
jianjun
|
c912c38ef1
|
Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
|
5 years ago |
|
jianjun
|
4071eda9c8
|
Merge branch 'dev_more_appid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
jianjun
|
d3bd176803
|
调整用户手机号全局唯一改为-客户唯一
|
5 years ago |
|
wangchao
|
fc1924a5a9
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
8fa14f19a2
|
搜索网格只显示区下的网格
|
5 years ago |
|
wangchao
|
01e9cfba26
|
搜索网格只显示区下的网格
|
5 years ago |
|
jianjun
|
ac12b274a9
|
部署user和party
|
5 years ago |
|
wxz
|
603233247d
|
版本升级
|
5 years ago |
|
jianjun
|
323ff93af5
|
Merge branches 'dev' and 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
zhangyongzhangyong
|
21e9b42273
|
实况列表返回值修改
|
5 years ago |
|
jianjun
|
bc1159f887
|
Merge branch 'dev_more_appid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
jianjun
|
c25d5ba08a
|
调整用户手机号全局唯一改为-客户唯一
|
5 years ago |
|
wangchao
|
5885e54de4
|
point服务版本 + 1
|
5 years ago |
|
wangchao
|
70ccc08755
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
36ab80c42f
|
活动积分发放 MqCallback
|
5 years ago |
|
zhangyongzhangyong
|
f66bc3f34a
|
添加实况，发送消息，新增sourceId
|
5 years ago |
yinzuomei
|
ce60d8e605
|
活动发放积分，调用消息，新增operatorId，值为当前登录用户
|
5 years ago |
|
wangchao
|
d420e9dcc9
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
