From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java b/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
index 76c84c0..c6ec9d3 100644
--- a/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
@@ -1,7 +1,48 @@
package com.mzl.flower.dto.response.statisticAnalysis;
+import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
-public class FlowerMaterialVO {
+@ApiModel("花材列表")
+public class FlowerMaterialVO extends AbstractTransDTO {
+
+ @ApiModelProperty(value = "供应商ID")
+ private String supplierId;
+ @ApiModelProperty(value = "供应商名称")
+ private String supplierName;
+ @ApiModelProperty(value = "注册手机号")
+ private String loginName;
+ @ApiModelProperty(value = "联系方式")
+ private String contactTel;
+ @ApiModelProperty(value = "所属集货站")
+ private String stationName;
+ @ApiModelProperty(value = "品类")
+ private String categoryName;
+ @ApiModelProperty(value = "父品类")
+ private String parentCategoryName;
+ @ApiModelProperty(value = "商品名称")
+ private String flowerName;
+ @ApiModelProperty(value = "等级-FLOWER_LEVEL")
+ @DictTrans(target = "flowerLevelStr", codeType = "FLOWER_LEVEL")
+ private String flowerLevel;
+ @ApiModelProperty(value = "等级")
+ private String flowerLevelStr;
+ @ApiModelProperty(value = "商品规格")
+ private String flowerUnit;
+ @ApiModelProperty(value = "价格")
+ private String flowerPrice;
+ @ApiModelProperty(value = "库存")
+ private String flowerStock;
+ @ApiModelProperty(value = "状态")
+ @DictTrans(target = "flowerStatusStr", codeType = "FLOWER_STATUS")
+ private String flowerStatus;
+ @ApiModelProperty(value = "状态")
+ private String flowerStatusStr;
+ @ApiModelProperty(value = "花ID")
+ private String flowerId;
+
}
--
Gitblit v1.9.3