YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ...

 Conflicts:

	yudao-module-mall/yudao-module-trade-biz/pom.xml

2022-10-23 22:16:54 +08:00

..

main/java/cn/iocoder/yudao/module/market

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

2022-10-23 22:16:54 +08:00

test/resources

mall：新增 discount 限时折扣、reward 满减送

2022-08-17 01:10:13 +08:00