|
|
28ce473568
|
Merge pull request '客服-最近浏览-字段缺失补充' (#64) from cxw into master
continuous-integration/drone/push Build is failing
Reviewed-on: #64
|
2024-10-23 14:09:44 +08:00 |
|
|
|
8f6e7e168a
|
客服-最近浏览-字段缺失补充
|
2024-10-23 12:53:21 +08:00 |
|
|
|
505aa43c36
|
Merge pull request '支付方式接口调整' (#63) from cxw into master
continuous-integration/drone/push Build is passing
Reviewed-on: #63
|
2024-10-23 11:01:58 +08:00 |
|
|
|
2f62a01f02
|
支付方式接口调整
|
2024-10-23 10:53:38 +08:00 |
|
|
|
1b70fdd086
|
Merge pull request '会员类型列表' (#62) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #62
|
2024-10-23 10:27:40 +08:00 |
|
|
|
9465085136
|
会员类型列表
|
2024-10-23 10:25:48 +08:00 |
|
|
|
6f5f3dd8b2
|
Merge pull request '重复充值余额处理' (#61) from cxw into master
continuous-integration/drone/push Build is passing
Reviewed-on: #61
|
2024-10-23 10:06:38 +08:00 |
|
|
|
1d50394776
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-22 22:56:13 +08:00 |
|
|
|
e9609ce7d5
|
余额充值微信未支付时，重复增加余额处理
|
2024-10-22 22:55:57 +08:00 |
|
|
|
5177793676
|
Merge pull request '修改支付状态' (#60) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #60
|
2024-10-22 18:25:50 +08:00 |
|
|
|
9d92e8c7f0
|
修改支付状态
|
2024-10-22 18:04:01 +08:00 |
|
|
|
334c3efbc0
|
Merge pull request '会员支付(试用)' (#59) from khy1 into master
continuous-integration/drone/push Build is failing
Reviewed-on: #59
|
2024-10-21 19:23:19 +08:00 |
|
|
|
89b94e856b
|
会员支付(试用)
|
2024-10-21 19:19:44 +08:00 |
|
|
|
0beaed16ba
|
Merge pull request '会员支付' (#58) from khy1 into master
continuous-integration/drone/push Build is failing
Reviewed-on: #58
|
2024-10-21 16:03:45 +08:00 |
|
|
|
bdbcae287c
|
会员支付
|
2024-10-21 16:01:06 +08:00 |
|
|
|
9d57571165
|
Merge pull request '预约模块添加预约项目管理' (#57) from sjy-two into master
continuous-integration/drone/push Build is failing
Reviewed-on: #57
|
2024-10-21 15:52:50 +08:00 |
|
|
|
208d0a6e97
|
预约模块添加预约项目管理
|
2024-10-21 15:51:14 +08:00 |
|
|
|
8ecd53d92a
|
Merge pull request '提交客服话术图片' (#56) from sjy-two into master
continuous-integration/drone/push Build is failing
Reviewed-on: #56
|
2024-10-21 15:19:58 +08:00 |
|
|
|
f94a161b2f
|
提交客服话术图片
|
2024-10-21 15:12:15 +08:00 |
|
|
|
a194b00ee8
|
Merge pull request 'khy1' (#55) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #55
|
2024-10-21 11:38:03 +08:00 |
|
|
|
caaca7b318
|
会员支付
|
2024-10-21 11:34:53 +08:00 |
|
|
|
3329093c88
|
会员支付
|
2024-10-21 11:18:46 +08:00 |
|
|
|
5cb71e0889
|
会员支付
|
2024-10-21 10:59:45 +08:00 |
|
|
|
6d8c8b4b83
|
Merge pull request '后台添加客服人员，话术，留言，自动回复' (#54) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #54
|
2024-10-21 10:35:48 +08:00 |
|
|
|
eb477862fc
|
Merge pull request 'bug修复和商品品牌信息返回' (#53) from cxw into master
continuous-integration/drone/push Build is passing
Reviewed-on: #53
|
2024-10-21 10:35:34 +08:00 |
|
|
|
85a0e9a9b1
|
后台添加客服人员，话术，留言，自动回复
|
2024-10-21 10:09:16 +08:00 |
|
|
|
11dd5f7f6f
|
会员支付
|
2024-10-21 08:49:23 +08:00 |
|
|
|
aed2d035c1
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-18 14:34:38 +08:00 |
|
|
|
1316b41df7
|
支付订单中merchant_order_id重复处理
|
2024-10-18 13:42:20 +08:00 |
|
|
|
8cc065e598
|
Merge pull request '添加预约信息' (#52) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #52
|
2024-10-18 09:33:42 +08:00 |
|
|
|
3bc97951e5
|
添加预约信息
|
2024-10-18 09:30:19 +08:00 |
|
|
|
e3d554da42
|
退款空指针处理
|
2024-10-17 16:30:07 +08:00 |
|
|
|
6ffa6d1af4
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-17 15:27:30 +08:00 |
|
|
|
38ddb26051
|
商品详情接口中添加品牌信息字段
|
2024-10-17 15:17:16 +08:00 |
|
|
|
b9f0591578
|
Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master
continuous-integration/drone/push Build is passing
Reviewed-on: #51
|
2024-10-17 11:24:41 +08:00 |
|
|
|
2f7ffb4032
|
Merge pull request '会员权益列表' (#50) from khy1 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #50
|
2024-10-17 11:24:09 +08:00 |
|
|
|
138ddc13bb
|
修改积分商城订单记录时间排序
|
2024-10-17 11:22:54 +08:00 |
|
|
|
d2c735ac18
|
会员权益列表
|
2024-10-17 11:19:48 +08:00 |
|
|
|
2c875571ee
|
Merge pull request '会员类型列表' (#49) from khy into master
continuous-integration/drone/push Build is passing
Reviewed-on: #49
|
2024-10-17 09:28:44 +08:00 |
|
|
|
228fe0cc82
|
会员类型列表
|
2024-10-17 09:19:31 +08:00 |
|
|
|
a6a1ab163d
|
Merge pull request 'cxw' (#48) from cxw into master
continuous-integration/drone Build is passing
Reviewed-on: #48
|
2024-10-16 15:06:54 +08:00 |
|
|
|
9860ff79d5
|
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
|
2024-10-16 15:03:29 +08:00 |
|
|
|
3eead082f8
|
Merge pull request '修改积分商城订单提交报错,增加后台积分订单记录' (#47) from sjy-two into master
Reviewed-on: #47
|
2024-10-16 15:03:12 +08:00 |
|
|
|
8b801be4f3
|
构建脚本调整
|
2024-10-16 15:00:14 +08:00 |
|
|
|
df69d98073
|
挂载本地图片路径
|
2024-10-16 14:48:58 +08:00 |
|
|
|
6de437634c
|
修改积分商城订单提交报错,增加后台积分订单记录
|
2024-10-16 14:35:09 +08:00 |
|
|
|
af92c1ca00
|
Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master
continuous-integration/drone/push Build is passing
Reviewed-on: #46
|
2024-10-16 13:57:33 +08:00 |
|
|
|
53128f0685
|
Merge pull request 'khy' (#45) from khy into master
continuous-integration/drone/push Build is running
Reviewed-on: #45
|
2024-10-16 13:57:22 +08:00 |
|
|
|
13eb6a75a9
|
1.后台前端-隐藏优惠券折扣选项
2.后台前端-优惠券有效期显示调整
|
2024-10-16 13:41:12 +08:00 |
|
|
|
78d3175151
|
Merge remote-tracking branch 'origin/master'
|
2024-10-15 19:51:27 +08:00 |
|
