 wanghaoran
|
a8494be9ba
|
Merge branch 'develop' into release
|
9 个月前 |
|
wanghaoran
|
813440bcba
|
领取积分
|
9 个月前 |
 wanjing
|
38231edf84
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
9 个月前 |
 wanjing
|
717f6d86e2
|
修改积分明细中缺少阅读知识积分记录问题
|
9 个月前 |
|
wanghaoran
|
c8dcc1c780
|
Merge branch 'develop' into release
|
9 个月前 |
|
wanjing
|
d808165d03
|
修改获取积分代码
|
10 个月前 |
|
wanjing
|
4b49b5c843
|
修改获取积分代码
|
10 个月前 |
|
wanjing
|
52e1bf4035
|
修改获取积分代码
|
10 个月前 |
|
wanjing
|
3bbf0b2e9f
|
提交领取积分代码
|
10 个月前 |
|
wanjing
|
3d741f5f05
|
提交我要上报接口
|
10 个月前 |
|
wanjing
|
dd939fc312
|
提交志愿者服务代码
|
10 个月前 |
|
wanghaoran
|
764ad53af5
|
Merge branch 'develop' into release
|
10 个月前 |
|
wanghaoran
|
c928621580
|
立即兑换
|
10 个月前 |
|
wanghaoran
|
88e44c3428
|
立即兑换
|
10 个月前 |
|
wanghaoran
|
e3c37c616a
|
我的兑换
|
10 个月前 |
|
wanghaoran
|
d62a1d8b32
|
Merge branch 'develop' into release
|
10 个月前 |
|
wanghaoran
|
093b957ad0
|
获取商铺信息 接口
|
10 个月前 |
|
wanghaoran
|
180e889b16
|
商品列表 接口
|
10 个月前 |
|
wanghaoran
|
071926739d
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
3be8d10e49
|
修改美景提交接口
|
1年前 |
 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年前 |
|
xiaoying
|
3e692eebd7
|
更新短信验证相关
|
1年前 |
|
wanghaoran
|
ad5e197f9c
|
暂时 注释掉，发送短信功能
|
1年前 |
|
wanghaoran
|
312ce165b9
|
打log
|
1年前 |
|
wanghaoran
|
c6c6a32b07
|
Merge branch 'release'
|
1年前 |
|
wanghaoran
|
da9958a65c
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
d3dfcd36b2
|
修改 我的兑换
|
1年前 |
|
wanghaoran
|
a3101fc48c
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
e80bf32dc3
|
我的兑换，修改
|
1年前 |
|
wanghaoran
|
c106ae3837
|
Merge branch 'develop' into release
|
1年前 |
|
xiaoying
|
dde2f3b339
|
新增接口积分查询相关 参加或提交建议时发送短信验证
|
1年前 |
|
wanghaoran
|
5a08480701
|
积分核销接口，增加商铺名称字段
|
1年前 |
|
wanghaoran
|
90764ab6b6
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
e08f31fe4d
|
增加积分 接口
|
1年前 |
|
wanghaoran
|
668af2343c
|
Merge branch 'release'
|
1年前 |
|
wanghaoran
|
5af8dffce5
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
dfd67b20ff
|
去除多余校验
|
1年前 |
|
wanghaoran
|
3e5c347fd5
|
Merge branch 'release'
|
1年前 |
|
wanghaoran
|
7c577ce8ac
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
42dca6ee8e
|
积分兑换
|
1年前 |
|
wanghaoran
|
961adc3787
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
464ebff780
|
租户code
|
1年前 |
|
wanghaoran
|
0b57d4b86c
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
55ebc2dbbe
|
租户code
|
1年前 |
|
wanghaoran
|
dcf246f21d
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
82438540c1
|
unionid赋值
|
1年前 |
|
wanghaoran
|
45c88b9fad
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
487d75c9ee
|
修改WestreamUser实体类
|
1年前 |
|
wanghaoran
|
5378548776
|
Merge branch 'develop' into release
|
1年前 |
|
wanghaoran
|
56058e505e
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_qmhh into develop
# Conflicts:
# tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WxServiceImpl.java
|
1年前 |
