wanjing
|
70ef2667b7
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
80445198e8
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
1889b700c6
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
3f85aa9eba
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
fca6fcb9f1
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
b3f9096a19
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
6800fffb25
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
cbb8326fc0
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
f2ee0f853e
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
9a399eecc1
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
04045dd14a
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
955a5d6ee5
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
5bce9d6e16
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
6832a8b6df
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
d79d10a482
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
2f7ce117cf
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
e86c34375a
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
0e812823c0
|
修改领取积分代码
|
11 mesi fa |
wanjing
|
05a148755c
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
b1e8e8ce49
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_qmhh into develop
|
11 mesi fa |
wanjing
|
e3cd96bd4e
|
领取积分与每天上限做判断
|
11 mesi fa |
wanghaoran
|
a8494be9ba
|
Merge branch 'develop' into release
|
11 mesi fa |
wanghaoran
|
813440bcba
|
领取积分
|
11 mesi fa |
wanjing
|
38231edf84
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
11 mesi fa |
wanjing
|
717f6d86e2
|
修改积分明细中缺少阅读知识积分记录问题
|
11 mesi fa |
wanghaoran
|
c8dcc1c780
|
Merge branch 'develop' into release
|
11 mesi fa |
wanjing
|
d808165d03
|
修改获取积分代码
|
11 mesi fa |
wanjing
|
4b49b5c843
|
修改获取积分代码
|
11 mesi fa |
wanjing
|
52e1bf4035
|
修改获取积分代码
|
11 mesi fa |
wanjing
|
3bbf0b2e9f
|
提交领取积分代码
|
11 mesi fa |
wanjing
|
3d741f5f05
|
提交我要上报接口
|
11 mesi fa |
wanjing
|
dd939fc312
|
提交志愿者服务代码
|
11 mesi fa |
wanghaoran
|
764ad53af5
|
Merge branch 'develop' into release
|
1 anno fa |
wanghaoran
|
c928621580
|
立即兑换
|
1 anno fa |
wanghaoran
|
88e44c3428
|
立即兑换
|
1 anno fa |
wanghaoran
|
e3c37c616a
|
我的兑换
|
1 anno fa |
wanghaoran
|
d62a1d8b32
|
Merge branch 'develop' into release
|
1 anno fa |
wanghaoran
|
093b957ad0
|
获取商铺信息 接口
|
1 anno fa |
wanghaoran
|
180e889b16
|
商品列表 接口
|
1 anno fa |
wanghaoran
|
071926739d
|
Merge branch 'develop' into release
|
1 anno fa |
wanghaoran
|
3be8d10e49
|
修改美景提交接口
|
1 anno fa |
xiaoying
|
db056b5d4d
|
Merge branch 'develop' into release
# Conflicts:
# tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamActivityApplyServiceImpl.java
# tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamSuggestServiceImpl.java
|
1 anno fa |
xiaoying
|
3e692eebd7
|
更新短信验证相关
|
1 anno fa |
wanghaoran
|
ad5e197f9c
|
暂时 注释掉,发送短信功能
|
1 anno fa |
wanghaoran
|
312ce165b9
|
打log
|
1 anno fa |
wanghaoran
|
c6c6a32b07
|
Merge branch 'release'
|
1 anno fa |
wanghaoran
|
da9958a65c
|
Merge branch 'develop' into release
|
1 anno fa |
wanghaoran
|
d3dfcd36b2
|
修改 我的兑换
|
1 anno fa |
wanghaoran
|
a3101fc48c
|
Merge branch 'develop' into release
|
1 anno fa |
wanghaoran
|
e80bf32dc3
|
我的兑换,修改
|
1 anno fa |