Merge remote-tracking branch 'origin/develop' into develop

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java

@@ -27,12 +27,12 @@ public class AppCommentPageReqVO extends PageParam {
      */
     public static final Integer NEGATIVE_COMMENT = 3;
 
-    @Schema(description = "商品SPU编号", example = "29502")
-    @NotNull(message = "商品SPU编号不能为空")
+    @Schema(description = "商品 SPU 编号", example = "29502")
+    @NotNull(message = "商品 SPU 编号不能为空")
     private Long spuId;
 
     @Schema(description = "app 评论页 tab 类型 (0 全部、1 好评、2 中评、3 差评)", example = "0")
-    @NotNull(message = "商品SPU编号不能为空")
+    @NotNull(message = "商品 SPU 编号不能为空")
     private Integer type;
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java

@@ -99,6 +99,9 @@ public class AppActivityController {
                         .setSpuId(item.getSpuId()).setStartTime(item.getStartTime()).setEndTime(item.getEndTime()));
             });
         }
+
+        // TODO 芋艿：满减送活动
+        // TODO 芋艿：限时折扣活动
         return activityList;
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java

@@ -47,7 +47,7 @@ public class AppCouponTemplateController {
     @Operation(summary = "获得优惠劵模版列表")
     @Parameters({
             @Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用
-            @Parameter(name = "useType", description = "使用类型"),
+            @Parameter(name = "productScope", description = "使用类型"),
             @Parameter(name = "count", description = "数量", required = true)
     })
     public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList(