Commit Graph

4303 Commits (0746c080b4f5c314c27208486cce3ebcf59d87a0)

Author SHA1 Message Date
TianYu 9f47ce9dda Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:56 +08:00
TianYu abbe8ea262 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:37 +08:00
perry 40e61464a8 打包测试 2023-05-18 14:57:09 +08:00
perry adacc2b6fe 打包测试 2023-05-18 14:56:40 +08:00
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
perry e007c7f2f6 打包测试 2023-05-18 14:47:40 +08:00
perry 58f6be0108 排除租户逻辑 2023-05-18 14:01:20 +08:00
perry 4524c475f1 前缀 2023-05-18 13:46:41 +08:00
perry 6fc3ce15a1 快递公司实体 2023-05-18 13:32:52 +08:00
perry 09659b936c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-18 13:25:53 +08:00
perry 6fac2affcc 测试环境 2023-05-18 13:25:44 +08:00
js199000131 cbf8056b88 物流公司和配置信息修改 2023-05-18 11:01:34 +08:00
tangqian c4bdbb6904 feat: 商城支付退款 2023-05-18 09:49:55 +08:00
tangqian 32a452e86c feat: 商城支付退款 2023-05-18 09:48:41 +08:00
tangqian a3cca0a41c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-18 09:45:35 +08:00
tangqian d958f5d012 feat: 商城支付退款 2023-05-18 09:45:29 +08:00
perry a0c0fc8437 打包 2023-05-17 23:09:32 +08:00
perry d4bb390916 打包 2023-05-17 23:02:34 +08:00
perry e05e28ce02 打包 2023-05-17 22:44:59 +08:00
perry 4b48821424 打包 2023-05-17 22:20:46 +08:00
perry 452dd6b983 打包 2023-05-17 21:55:05 +08:00
perry d9b6b286f5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
#	yudao-ui-admin/.env.dev
2023-05-17 21:50:55 +08:00
perry 7870f79674 打包 2023-05-17 21:50:20 +08:00
tangqian 711b61ca25 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 18:21:41 +08:00
tangqian 630e1d454e feat: 商城退款 2023-05-17 18:13:35 +08:00
TianYu d6e861a106 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 17:58:21 +08:00
TianYu 983f098870 feat: 新增推广员功能 2023-05-17 17:58:09 +08:00
tangqian dea7cb0b77 feat: 会员充值,退款,会员展示,充值列表 2023-05-17 17:51:27 +08:00
TianYu 9617169e6f feat: 增加支付宝支付 2023-05-17 16:28:31 +08:00
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