 tianyu
|
8310ec40d1
|
Merge pull request '合并代码' (#2) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/2
|
2023-05-29 20:27:42 +08:00 |
|
tianyu
|
bac30ebbbf
|
Merge branch 'master' into feature/mall_product
|
2023-05-29 20:25:40 +08:00 |
|
TianYu
|
b0771db696
|
fix: 修复bug
|
2023-05-29 20:20:33 +08:00 |
 Jruome
|
ef9ee333f7
|
uniapp 样式修改
|
2023-05-29 20:19:04 +08:00 |
tangqian
|
f9a503248e
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-29 20:07:36 +08:00 |
|
tangqian
|
7ce9dabc95
|
fix: 退出登录忽略租户
|
2023-05-29 20:05:52 +08:00 |
|
Jruome
|
e7145eb51c
|
uniapp input匹配修改
|
2023-05-29 19:59:33 +08:00 |
|
Jruome
|
79a37da568
|
uniapp input样式修改
|
2023-05-29 19:42:30 +08:00 |
|
Jruome
|
4a3d8a01c3
|
Merge remote-tracking branch 'origin/feature/mall_product'
|
2023-05-29 19:25:57 +08:00 |
|
Jruome
|
855988d631
|
uniapp bug修改
|
2023-05-29 19:25:31 +08:00 |
|
tangqian
|
31e0ce4e7a
|
Merge branch 'feature/mall_product'
|
2023-05-29 19:23:34 +08:00 |
|
tangqian
|
27a3cfedca
|
fix: 退出登录忽略租户
|
2023-05-29 19:23:23 +08:00 |
|
tangqian
|
575dbb8b6a
|
fix: 退出登录忽略租户
|
2023-05-29 19:22:48 +08:00 |
|
tangqian
|
b1ac278cc2
|
fix: 退出登录忽略租户
|
2023-05-29 19:22:22 +08:00 |
|
TianYu
|
a8fdac59f5
|
fix: 修复bug
|
2023-05-29 19:08:46 +08:00 |
|
Jruome
|
694d8d47b5
|
uniapp 支付修改
|
2023-05-29 18:38:23 +08:00 |
|
TianYu
|
28b5ecba88
|
fix: 修复ubg
|
2023-05-29 18:29:13 +08:00 |
|
Jruome
|
b33fcd347e
|
Merge remote-tracking branch 'origin/feature/mall_product'
|
2023-05-29 18:29:01 +08:00 |
|
Jruome
|
e31b117d09
|
管理端 轮播跳转地址非必填
|
2023-05-29 18:28:38 +08:00 |
|
TianYu
|
74d67d9968
|
fix: 修改bug
|
2023-05-29 17:49:01 +08:00 |
|
TianYu
|
585a25e4f0
|
fix: 修改bug
|
2023-05-29 17:46:22 +08:00 |
|
TianYu
|
04042caf41
|
fix: 功能调整
|
2023-05-29 17:31:52 +08:00 |
|
Jruome
|
53d55cc6e9
|
uniapp 首页商品隐藏
|
2023-05-29 17:15:13 +08:00 |
|
TianYu
|
3d34feb481
|
fix: 修复bug
|
2023-05-29 17:01:10 +08:00 |
|
TianYu
|
9a084e3a48
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-29 15:38:15 +08:00 |
|
TianYu
|
950a9c2b62
|
feat: 增加会员换绑推广员功能
|
2023-05-29 15:37:57 +08:00 |
|
tangqian
|
a9d141e2dc
|
Merge branch 'feature/mall_product'
|
2023-05-29 15:00:19 +08:00 |
|
tangqian
|
7709370ca5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-29 14:59:06 +08:00 |
|
tangqian
|
80937224e5
|
fix: 商城支付相关
|
2023-05-29 14:56:34 +08:00 |
|
TianYu
|
bcfc0dba18
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-29 14:43:14 +08:00 |
|
TianYu
|
eab653230d
|
feat: 订单下单支付跳转
|
2023-05-29 14:43:03 +08:00 |
 perry
|
d699437155
|
Merge branch 'feature/mall_product_new'
|
2023-05-29 12:55:27 +08:00 |
|
perry
|
524d0fc077
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-29 12:55:12 +08:00 |
|
perry
|
478c21b7fb
|
分销数据统计
|
2023-05-29 12:54:51 +08:00 |
|
perry
|
e79abc1405
|
分销数据统计
|
2023-05-29 12:54:00 +08:00 |
|
Jruome
|
bd53fae597
|
管理端 按钮路由标识
|
2023-05-29 10:19:13 +08:00 |
|
TianYu
|
49c9611182
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-29 09:54:24 +08:00 |
|
TianYu
|
b979f77097
|
fix: 修复bug
|
2023-05-29 09:51:19 +08:00 |
|
perry
|
9b5f694e1b
|
Merge remote-tracking branch 'origin/master'
|
2023-05-29 09:46:53 +08:00 |
|
perry
|
36a744a6ef
|
Merge branch 'feature/mall_product_new'
|
2023-05-29 09:46:38 +08:00 |
|
perry
|
21790ab31d
|
分销数据统计
|
2023-05-29 09:46:14 +08:00 |
|
perry
|
4aadcef501
|
推广员导出
|
2023-05-28 11:36:55 +08:00 |
|
perry
|
5641f8d322
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-27 12:22:03 +08:00 |
|
perry
|
2d5c8236c7
|
会员管理充值订单数据权限
|
2023-05-27 12:21:55 +08:00 |
|
Jruome
|
db940da972
|
uniapp 发展会员业绩
|
2023-05-26 18:23:34 +08:00 |
|
tangqian
|
0736bd8e20
|
fix: 商城支付相关
|
2023-05-26 18:19:56 +08:00 |
|
tangqian
|
e379bff378
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-26 18:18:59 +08:00 |
|
tangqian
|
fe3648013c
|
fix: 商城支付相关
|
2023-05-26 18:18:52 +08:00 |
 js199000126
|
8af70137b9
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-26 17:58:37 +08:00 |
|
js199000126
|
532b9f1d47
|
订单
|
2023-05-26 17:58:32 +08:00 |