Commit Graph

5356 Commits

Author SHA1 Message Date
芋道源码 1d3ef770a0
!703 商城装修
Merge pull request !703 from 疯狂的世界/feature/mall_diy
2023-10-29 14:15:55 +00:00
owen b5f9ed9edf 营销:装修SQL调整 2023-10-29 22:04:21 +08:00
owen c637a172ec 营销:装修代码整理 2023-10-29 18:50:55 +08:00
owen 3a2ccc9d6b 营销:装修模板、装修页面 2023-10-27 14:58:04 +08:00
YunaiV 07dbfc5546 code review:sign 签到逻辑 2023-10-24 19:08:08 +08:00
芋道源码 c7695def5e
!694 完善 review 提到的问题,商品模块移除对营销模块的依赖
Merge pull request !694 from puhui999/feature/mall_product
2023-10-24 10:49:13 +00:00
puhui999 ff3b1e942a Banner: market ==> promotion 2023-10-24 18:00:35 +08:00
puhui999 3672d0f245 商品模块移除对营销模块的依赖 2023-10-23 17:29:26 +08:00
puhui999 6723cae781 营销活动:完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
YunaiV 9697aee898 code review:钱包的逻辑 2023-10-21 21:17:49 +08:00
YunaiV 0db4581030 code review:签到逻辑 2023-10-21 19:56:53 +08:00
芋道源码 3e570b8b89
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
2023-10-21 11:31:56 +00:00
YunaiV 785fbeeb5b code review:限时折扣活动 2023-10-21 18:16:09 +08:00
芋道源码 90fb2c62b8
!683 mall模块
Merge pull request !683 from zxiaoxiu/discount
2023-10-21 09:23:50 +00:00
puhui999 0e754a9924 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-21 17:09:24 +08:00
puhui999 f363c598d8 Banner:完善 review 提到的问题 2023-10-21 17:09:04 +08:00
jason 89e847c8cd 钱包,转账 review 修改 2023-10-21 15:28:07 +08:00
puhui999 1bb2010dc0 签到记录:完善 review 提到的问题 2023-10-21 01:11:10 +08:00
puhui999 2f7371b4ea 签到记录:完善 review 提到的问题 2023-10-21 01:01:06 +08:00
jason db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-20 23:22:16 +08:00
jason 183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 2023-10-20 23:20:47 +08:00
puhui999 f18a4741a9 营销活动:完善 review 提到的问题 2023-10-20 22:32:37 +08:00
puhui999 f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-20 21:04:47 +08:00
zhangshuai 04061b028c mall模块-限时折扣功能 2023-10-20 20:54:16 +08:00
puhui999 283ca908b7 SPU: 完善选择优惠卷 2023-10-20 16:35:49 +08:00
puhui999 6e11154010 SPU: 添加选择优惠卷 2023-10-20 11:35:16 +08:00
YunaiV 6c8e82ca5a code review:自提统计 2023-10-20 00:30:27 +08:00
芋道源码 8bd1942083
!676 交易:核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
2023-10-19 15:59:00 +00:00
YunaiV 453f69931f code review:营销文章 2023-10-19 23:41:39 +08:00
YunaiV 64b842ed94 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:45 +08:00
芋道源码 e21422d119
!678 营销活动:完善 review 提到的问题
Merge pull request !678 from puhui999/feature/mall_product
2023-10-19 15:31:36 +00:00
YunaiV f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:21 +08:00
YunaiV 979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2023-10-19 21:42:39 +08:00
YunaiV 6f757e5297 saas:支持社交应用的多租户配置(mp) 2023-10-19 12:54:44 +08:00
YunaiV d256275099 saas:支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
zhijiantianya@gmail.com 00e18a480f code review:钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
puhui999 ffbf9278b8 营销文章:修正文章浏览量类型错误,新增时初始化浏览量 2023-10-18 11:27:14 +08:00
puhui999 6081ce30d5 营销活动:完善 review 提到的问题 2023-10-18 11:09:20 +08:00
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
2023-10-17 23:29:11 +08:00
YunaiV 5842a361e2 同步最新 SQL 脚本 2023-10-17 23:23:17 +08:00
owen 0612a13cce 交易:核销订单 2023-10-17 23:18:08 +08:00
zhijiantianya@gmail.com 4b0333f3e9 code review:订单统计 2023-10-17 20:42:22 +08:00
zhijiantianya@gmail.com 0dcab0363d Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-17 20:29:54 +08:00
芋道源码 3c6c8aab01
!672 Review代码修改
Merge pull request !672 from 疯狂的世界/feature/mall_product
2023-10-17 12:28:47 +00:00
owen b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/statistics.sql
2023-10-17 16:13:46 +08:00
owen 5e65512a92 交易:订单核销 2023-10-17 16:09:37 +08:00
zhijiantianya@gmail.com ba271da427 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro into feature/mall_product 2023-10-17 10:56:36 +08:00
YunaiV d842708c23 code review:数据统计 2023-10-16 23:42:54 +08:00
YunaiV d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:51:28 +08:00