puhui999 01ef5f7911 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java		2023-10-16 17:47:17 +08:00
..
yudao-module-product-api	code review：积分、优惠劵、佣金等逻辑	2023-10-01 23:31:07 +08:00
yudao-module-product-biz	营销活动: 新增文章管理	2023-10-15 16:16:41 +08:00
yudao-module-promotion-api	code review：拼团逻辑	2023-10-16 09:07:02 +08:00
yudao-module-promotion-biz	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-10-16 17:47:17 +08:00
yudao-module-statistics-api	商城：增加商城首页	2023-10-16 09:51:20 +08:00
yudao-module-statistics-biz	统计：会员终端统计接口实现	2023-10-16 14:23:53 +08:00
yudao-module-trade-api	同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files	2023-10-14 17:45:49 +08:00
yudao-module-trade-biz	1. APP增加终端Header[terminal]	2023-10-16 15:06:59 +08:00
pom.xml	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00