From 331c41ca7f21b81985ba23d60ec05c350d21daa8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:59:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerMaterialDTO.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerMaterialDTO.java b/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerMaterialDTO.java
index e316a5f..d368041 100644
--- a/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerMaterialDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerMaterialDTO.java
@@ -1,7 +1,32 @@
package com.mzl.flower.dto.request.statisticAnalysis;
+import com.mzl.flower.base.annotation.DictTrans;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class FlowerMaterialDTO {
+
+ @ApiModelProperty(value = "供应商ID")
+ private Long supplierId;
+ @ApiModelProperty(value = "供应商名称")
+ private String supplierName;
+ @ApiModelProperty(value = "注册手机号")
+ private String loginName;
+ @ApiModelProperty(value = "联系方式")
+ private String contactTel;
+ @ApiModelProperty(value = "所属集货站")
+ private String stationId;
+ @ApiModelProperty(value = "品类")
+ private String flowerCategory;
+ @ApiModelProperty(value = "状态")
+ private String flowerStatus;
+ @ApiModelProperty(value = "等级-FLOWER_LEVEL")
+ private String flowerLevel;
+ @ApiModelProperty(value = "父品类",hidden = true)
+ private String parentflowerCategory;
+ @ApiModelProperty(value = "排序字段")
+ private String orderField;
+ @ApiModelProperty(value = "排序类型，ASC 升序，DESC 降序")
+ private String orderType;
}
--
Gitblit v1.9.3