Merge remote-tracking branch 'origin/master'

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java

@@ -47,7 +47,6 @@ public class RemarkController {
 
     @GetMapping("/list")
     @Operation(summary = "获得备注列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('infra:remark:query')")
     public CommonResult<List<RemarkRespVO>> getRemarkList(@Valid RemarkListReqVO listVO) {
         List<RemarkDO> list = remarkService.getRemarkList(listVO);

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java

@@ -25,7 +25,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 
 import static com.win.framework.common.pojo.CommonResult.success;
@@ -51,10 +50,9 @@ public class TrendsController {
 
     @GetMapping("/list")
     @Operation(summary = "获得动态记录列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('infra:trends:query')")
-    public CommonResult<List<TrendsRespVO>> getTrendsList(@RequestParam("ids") Collection<Long> ids) {
-        List<TrendsDO> list = trendsService.getTrendsList(ids);
+    public CommonResult<List<TrendsRespVO>> getTrendsList(@Valid TrendsExportReqVO exportReqVO) {
+        List<TrendsDO> list = trendsService.getTrendsList(exportReqVO);
         return success(TrendsConvert.INSTANCE.convertList(list));
     }
 

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExportReqVO.java

@@ -1,12 +1,11 @@
 package com.win.module.infra.controller.trends.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
-import java.time.LocalDateTime;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 动态记录 Excel 导出 Request VO，参数和 TrendsPageReqVO 是一致的")
@@ -19,7 +18,7 @@ public class TrendsExportReqVO {
     @Schema(description = "表数据id", example = "9210")
     private Long tableId;
 
-    @Schema(description = "类型1增加2删除3修改", example = "2")
+    @Schema(description = "类型", example = "2")
     private Byte type;
 
     @Schema(description = "创建时间")