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
..
main/java/cn/iocoder/yudao/module/system	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2023-10-24 19:09:01 +08:00
test	修复报错的单元测试	2023-10-22 08:55:27 +08:00
test-integration	移除云片短信渠道，解决云片的安全风险	2022-11-25 21:04:40 +08:00