- 前端：满减送列表

- 前端：限时折扣列表

promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsPromotionActivityController.java

@@ -26,8 +26,8 @@ public class AdminsPromotionActivityController {
     private PromotionActivityService promotionActivityService;
 
     @GetMapping("/page") // TODO 芋艿，BO => VO
-    public CommonResult<PromotionActivityPageBO> page(@RequestParam("title") String title,
-                                                      @RequestParam("activityType") Integer activityType,
+    public CommonResult<PromotionActivityPageBO> page(@RequestParam(value = "title", required = false) String title,
+                                                      @RequestParam(value = "activityType") Integer activityType,
                                                       @RequestParam(value = "status") String status,
                                                       @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/PromotionActivityBO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -30,6 +31,14 @@ public class PromotionActivityBO implements Serializable {
      * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum} 枚举
      */
     private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
     /**
      * 限制折扣
      */
@@ -40,7 +49,7 @@ public class PromotionActivityBO implements Serializable {
     private FullPrivilege fullPrivilege;
 
     /**
-     * 限制折扣
+     * 限时折扣
      */
     @Data
     @Accessors(chain = true)