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
..
yudao-module-system-api	member：优化部分变量的命名	2023-10-22 16:35:48 +08:00
yudao-module-system-biz	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2023-10-24 19:09:01 +08:00
pom.xml	1. 【修复】单元测试报错	2022-04-22 00:07:54 +08:00