From 446868d70ffeecaeeffb3bed900c0be97ecadbab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 20 Apr 2022 08:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
index 080f1bd..428491e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
@@ -18,15 +18,13 @@
public static final String DAY = "1";
public static final String MONTH = "2";
public static final String YEAR = "3";
+ public static final String WEEK = "4";
- @ApiModelProperty(value = "数据类型 1-销售 2-消耗")
+ @ApiModelProperty(value = "数据类型 1-销售 2-消耗", example = "1")
private String dataType;
- @ApiModelProperty(value = "排行榜类型 1-日榜 2-月榜 3-年榜")
+ @ApiModelProperty(value = "排行榜类型 1-日榜 2-月榜 3-年榜 4-周榜", example = "1")
private String type;
-
- @ApiModelProperty(value = "时间")
- private String time;
public String getDataType() {
return dataType;
@@ -42,13 +40,5 @@
public void setType(String type) {
this.type = type;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
}
}
--
Gitblit v1.9.1