Commit Graph

4199 Commits (06a36c666822b4f3f3e37d4555f984f0684a806b)

Author SHA1 Message Date
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
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
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
小小张 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
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
js199000131 60102c7bc7 用户收件地址字段名称修改 2023-05-15 10:26:17 +08:00
小小张 481473c310 App订单、商品实体类--修改 2023-05-15 10:15:43 +08:00
TianYu eb6fc5d9c7 feat: 提交代码 2023-05-15 10:12:22 +08:00
js199000131 982bdcd9ad 物流、商品和支付修改 2023-05-15 10:05:36 +08:00
perry 4e350e2767 商品管理 2023-05-15 09:56:07 +08:00
perry 69da62ea38 商品管理 2023-05-14 18:08:19 +08:00
perry f538a15636 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-14 17:37:04 +08:00
perry b7e1341962 商品管理 2023-05-14 17:36:50 +08:00
js199000131 d624879f22 商品和支付 2023-05-14 15:44:42 +08:00
perry 3f213a4ae6 商品管理 2023-05-14 13:33:10 +08:00
perry dece26fce7 商品管理 2023-05-12 19:04:02 +08:00
小小张 b502c67b65 App订单、商品--修改 2023-05-12 18:09:39 +08:00
小小张 7b87b5ae21 App订单、商品--拷贝 2023-05-12 18:07:55 +08:00
TianYu 609821a5c7 feat: 新增订单模块 2023-05-12 15:24:57 +08:00
小小张 5254574914 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-12 10:20:18 +08:00
小小张 29e43885c5 订单管理--修改 2023-05-12 10:19:46 +08:00
Jruome 153a26612d 商品页面初始化 2023-05-12 10:11:30 +08:00
TianYu 54ad77ad37 feat: 拷贝商品功能 2023-05-12 09:36:43 +08:00
perry 1622984df7 商品管理 2023-05-11 22:33:51 +08:00
小小张 693839a486 订单管理 2023-05-11 18:06:00 +08:00
js199000131 799c4604b1 物流管理修改 2023-05-11 16:21:08 +08:00
小小张 5342d330ef 物流管理 2023-05-11 10:09:11 +08:00
小小张 2ae682c190 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-11 10:08:45 +08:00