xiaobai 32b348a2d3 Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java		2023-06-19 13:06:00 +08:00
..
src	Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product	2023-06-19 13:06:00 +08:00
pom.xml	mall + promotion：mock 拼团列表	2023-06-18 00:35:22 +08:00