YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java		2023-10-24 19:09:01 +08:00
..
src	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2023-10-24 19:09:01 +08:00
pom.xml	商品模块移除对营销模块的依赖	2023-10-23 17:29:26 +08:00