 wanghaoran
|
ae88d23bd5
|
Merge branch 'release'
|
1 rok temu |
|
wanghaoran
|
d62a1d8b32
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
093b957ad0
|
获取商铺信息 接口
|
1 rok temu |
|
wanghaoran
|
180e889b16
|
商品列表 接口
|
1 rok temu |
|
wanghaoran
|
57358f65e8
|
Merge branch 'release'
|
1 rok temu |
|
wanghaoran
|
071926739d
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
3be8d10e49
|
修改美景提交接口
|
1 rok temu |
|
wanghaoran
|
edd8527d50
|
Merge branch 'release'
|
1 rok temu |
 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 rok temu |
|
xiaoying
|
3e692eebd7
|
更新短信验证相关
|
1 rok temu |
|
wanghaoran
|
0fc891b235
|
Merge branch 'hotfix'
|
1 rok temu |
|
wanghaoran
|
ad5e197f9c
|
暂时 注释掉，发送短信功能
|
1 rok temu |
|
wanghaoran
|
a91e27ad2c
|
Merge branch 'hotfix'
|
1 rok temu |
|
wanghaoran
|
312ce165b9
|
打log
|
1 rok temu |
|
wanghaoran
|
c6c6a32b07
|
Merge branch 'release'
|
1 rok temu |
|
wanghaoran
|
da9958a65c
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
d3dfcd36b2
|
修改 我的兑换
|
1 rok temu |
|
wanghaoran
|
a3101fc48c
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
e80bf32dc3
|
我的兑换，修改
|
1 rok temu |
|
wanghaoran
|
c106ae3837
|
Merge branch 'develop' into release
|
1 rok temu |
|
xiaoying
|
dde2f3b339
|
新增接口积分查询相关 参加或提交建议时发送短信验证
|
1 rok temu |
|
wanghaoran
|
5a08480701
|
积分核销接口，增加商铺名称字段
|
1 rok temu |
|
wanghaoran
|
90764ab6b6
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
e08f31fe4d
|
增加积分 接口
|
1 rok temu |
|
wanghaoran
|
668af2343c
|
Merge branch 'release'
|
1 rok temu |
|
wanghaoran
|
5af8dffce5
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
dfd67b20ff
|
去除多余校验
|
1 rok temu |
|
wanghaoran
|
3e5c347fd5
|
Merge branch 'release'
|
1 rok temu |
|
wanghaoran
|
7c577ce8ac
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
42dca6ee8e
|
积分兑换
|
1 rok temu |
|
wanghaoran
|
961adc3787
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
464ebff780
|
租户code
|
1 rok temu |
|
wanghaoran
|
0b57d4b86c
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
55ebc2dbbe
|
租户code
|
1 rok temu |
|
wanghaoran
|
dcf246f21d
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
82438540c1
|
unionid赋值
|
1 rok temu |
|
wanghaoran
|
45c88b9fad
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
487d75c9ee
|
修改WestreamUser实体类
|
1 rok temu |
|
wanghaoran
|
5378548776
|
Merge branch 'develop' into release
|
1 rok temu |
|
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 rok temu |
|
wanghaoran
|
8b525747f6
|
完善查询用户积分 和 消减用户积分接口代码
|
1 rok temu |
 chenjiandong
|
659861633b
|
三勾商城对接接口
|
1 rok temu |
 gitadmin
|
f1d50eb5a7
|
Merge branch 'develop' of gitadmin/tuoheng_qmhh into release
|
1 rok temu |
|
chenjiandong
|
4f1f9b2c61
|
三勾商城对接接口
|
1 rok temu |
|
gitadmin
|
762c6143ca
|
Merge branch 'release' of gitadmin/tuoheng_qmhh into master
|
1 rok temu |
|
wanghaoran
|
fba7f4799a
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
a70d9803d9
|
修改更新视频观看进度 接口
|
1 rok temu |
|
wanghaoran
|
db5d738b9a
|
Merge branch 'develop' into release
|
1 rok temu |
|
wanghaoran
|
bacc0b6e2e
|
打日志，2023-6-14 14:03:00
|
1 rok temu |
|
wanghaoran
|
5bc4e6168e
|
Merge branch 'develop' into release
|
1 rok temu |
