From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java b/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
index 702bc00..979b54b 100644
--- a/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
@@ -2,8 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -13,19 +12,19 @@
* @date : 2026/1/15 10:18
*/
@Data
-@ApiModel
+@Schema
public class StatisticsTableDto{
private String customerName;
private String productCategory;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM")
private Date entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM")
private Date entryDateEnd;
}
--
Gitblit v1.9.3