Commit Graph

4324 Commits (a8bfcebce4e85340339d31e330ba4da6a899251a)

Author SHA1 Message Date
Jruome 91df476b68 uniapp 会员申请 2023-05-17 15:28:00 +08:00
Jruome 04fbb93fa6 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-17 15:27:44 +08:00
Jruome 40dd065e30 uniapp 会员申请 2023-05-17 15:25:16 +08:00
perry 42091eedca Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 15:09:09 +08:00
perry da28864ded 测试地址 2023-05-17 15:08:10 +08:00
axzsd efd9296275 构建文件 2023-05-17 14:49:13 +08:00
axzsd 5af7c10fce 构建文件 2023-05-17 14:46:31 +08:00
axzsd df3f811ddf 构建文件 2023-05-17 14:42:10 +08:00
axzsd fec78bc6d8 构建文件 2023-05-17 14:41:11 +08:00
axzsd 79e5fafbfe 构建文件 2023-05-17 14:41:02 +08:00
axzsd 1c26c9142b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 14:39:30 +08:00
axzsd b7241ecd09 构建文件 2023-05-17 14:39:25 +08:00
TianYu d1c0e148bd Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 14:37:30 +08:00
TianYu 907b2b7582 feat: 轮播图功能开发 2023-05-17 14:37:27 +08:00
perry 68227bf677 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 14:18:33 +08:00
perry 9fbee20579 推广员 2023-05-17 14:17:20 +08:00
tangqian 05e0c40659 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 10:54:06 +08:00
tangqian 34c0db7cf1 feat: 会员充值,退款,会员展示,充值列表 2023-05-17 10:53:59 +08:00
luli 3efa1384c8 feat: 订单导出 2023-05-17 10:36:46 +08:00
perry 06a36c6668 环境地址 2023-05-17 09:55:53 +08:00
TianYu fd0627c470 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 09:53:55 +08:00
TianYu 405e61876a feat: 修改生产环境服务器地址 2023-05-17 09:53:43 +08:00
perry 467c1dd402 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 09:32:22 +08:00
perry 8798b872e6 推广员导入 2023-05-17 09:32:13 +08:00
小小张 201f44a588 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-16 18:47:34 +08:00
小小张 80e679a751 后台--调试物流、规格 2023-05-16 18:46:19 +08:00
axzsd 6743936872 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-16 18:39:49 +08:00
axzsd f378e6ecbb 构建文件 2023-05-16 18:39:44 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
tangqian adcb6d26f2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
2023-05-16 18:19:55 +08:00
tangqian 26a8631927 feat: 会员充值,退款 2023-05-16 18:19:33 +08:00
perry 901f666fcb Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-16 18:18:04 +08:00
perry 72645b9dfc 商户管理 2023-05-16 18:17:54 +08:00
Jruome b71fff7e00 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-16 18:15:01 +08:00
TianYu 4ce486afef Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-16 18:01:05 +08:00
TianYu 24b4be91d0 feat: 功能开发 2023-05-16 18:00:52 +08:00
axzsd 7b2bd4c26b 构建文件 2023-05-16 17:47:16 +08:00
axzsd e486eed737 构建文件 2023-05-16 17:34:03 +08:00
perry 9b9af448fc 支付 2023-05-16 12:33:49 +08:00
Jruome 88980480cb Merge remote-tracking branch 'origin/feature/mall_product'
# Conflicts:
#	yudao-ui-admin/yarn.lock
2023-05-16 09:53:40 +08:00
小小张 a4246b55b9 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-16 09:24:02 +08:00
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
perry b18828d86d 环境部署 2023-05-15 22:12:58 +08:00
perry 39e87b3701 充值记录 2023-05-15 18:28:49 +08:00
TianYu d59775eb86 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-15 18:19:26 +08:00
TianYu a32c7378d6 feat: 增加注册页面 2023-05-15 18:19:03 +08:00
perry e6387b5411 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-15 14:54:21 +08:00
perry 7a6b3ab7a2 充值记录 2023-05-15 14:54:10 +08:00
Jruome 00d7d6528d Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-15 10:39:07 +08:00
TianYu 927568c0d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server 2023-05-15 10:36:04 +08:00