tangqian
|
64a66f2a3a
|
Merge branch 'feature/mall_product'
|
2023-05-25 12:02:15 +08:00 |
|
tangqian
|
fb3196dcca
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-25 11:25:38 +08:00 |
|
tangqian
|
01a1e11f9b
|
fix: 充值相关
|
2023-05-25 11:25:33 +08:00 |
 TianYu
|
99f1fb5e33
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-25 11:23:34 +08:00 |
|
TianYu
|
1462178e7a
|
fix: 生成海报失败增加提示
|
2023-05-25 11:23:31 +08:00 |
 Jruome
|
b11b71be2e
|
uniapp 手机号正则修改
|
2023-05-25 11:08:25 +08:00 |
 perry
|
7569be214a
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 22:19:32 +08:00 |
|
perry
|
89b9155679
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 20:05:14 +08:00 |
|
perry
|
65138e37a5
|
订单用户id
|
2023-05-24 20:05:05 +08:00 |
|
Jruome
|
6fadb15d27
|
uniapp 话费返回详情
|
2023-05-24 19:59:44 +08:00 |
 小小张
|
ca79db833d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 19:18:51 +08:00 |
|
perry
|
ce30a61ea5
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:18:43 +08:00 |
|
小小张
|
af3ce42881
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 19:18:36 +08:00 |
|
perry
|
fee30e45bd
|
下单退款删除本地提报
|
2023-05-24 19:18:15 +08:00 |
|
小小张
|
65ed6707da
|
后台--运费模板：配送区域修改
|
2023-05-24 19:15:54 +08:00 |
|
perry
|
0aafa2fd7c
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:06:33 +08:00 |
|
perry
|
61b36bdca3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 19:06:20 +08:00 |
|
perry
|
8aa259531a
|
下单
|
2023-05-24 19:06:11 +08:00 |
|
TianYu
|
1377880c54
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 19:02:10 +08:00 |
|
TianYu
|
7a2b8e64a3
|
fix: 调整海报文案
|
2023-05-24 19:01:59 +08:00 |
|
perry
|
82692fecaf
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:01:23 +08:00 |
|
perry
|
5af1206445
|
下单
|
2023-05-24 18:57:56 +08:00 |
|
TianYu
|
4aed73b1d5
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 18:34:46 +08:00 |
|
TianYu
|
66e4d6ee54
|
fix: 调整充值页面生命周期
|
2023-05-24 18:34:43 +08:00 |
|
小小张
|
51d1392919
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 18:14:37 +08:00 |
|
小小张
|
c8b41aa45e
|
后台--运费模板：配送区域修改
|
2023-05-24 18:14:14 +08:00 |
|
perry
|
328864388b
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 18:11:23 +08:00 |
|
perry
|
6d81160d30
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 18:10:21 +08:00 |
|
perry
|
ac7a9d9c4c
|
访问地址
|
2023-05-24 18:10:09 +08:00 |
|
Jruome
|
cd68bf0be8
|
uniapp 会员权益
|
2023-05-24 17:51:37 +08:00 |
 js199000126
|
fee16f8471
|
商城-购物车
|
2023-05-24 17:11:30 +08:00 |
|
js199000126
|
4f1d28feac
|
商城-购物车
|
2023-05-24 17:08:06 +08:00 |
|
perry
|
cbed37d4f0
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 17:04:28 +08:00 |
|
perry
|
fcb1713e03
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 17:04:14 +08:00 |
|
perry
|
8a23fc1dc9
|
访问地址
|
2023-05-24 17:04:06 +08:00 |
|
Jruome
|
b18ed2551c
|
uniapp 会员权益
|
2023-05-24 17:00:39 +08:00 |
|
TianYu
|
9ccba3d554
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 16:54:18 +08:00 |
|
TianYu
|
989fec4ebc
|
fix: 修复IOS无法生成海报的问题
|
2023-05-24 16:54:06 +08:00 |
|
perry
|
7370c9467f
|
Merge remote-tracking branch 'origin/master'
|
2023-05-24 16:36:54 +08:00 |
|
perry
|
9e28c0b616
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 16:36:38 +08:00 |
|
tangqian
|
e44f1addb5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 16:34:37 +08:00 |
|
tangqian
|
a1de97950c
|
fix: 商城相关
|
2023-05-24 16:34:28 +08:00 |
|
perry
|
3c94af6408
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 16:27:16 +08:00 |
|
perry
|
e9da423776
|
提报记录
|
2023-05-24 16:25:43 +08:00 |
|
TianYu
|
87b0d7353a
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 16:04:19 +08:00 |
|
TianYu
|
51e3506baf
|
fix: 海报文案修改
|
2023-05-24 16:03:59 +08:00 |
|
perry
|
b87a5d35a7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-24 16:03:33 +08:00 |
|
perry
|
749e4b7459
|
提报记录
|
2023-05-24 16:02:21 +08:00 |
|
TianYu
|
be58048ce7
|
fix: 海报文案修改
|
2023-05-24 16:00:06 +08:00 |
|
TianYu
|
2987f82352
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 15:56:50 +08:00 |