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/response/statisticAnalysis/FlowerMaterialVO.java | 2 ++
1 files changed, 2 insertions(+), 0 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 bdf5a4d..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
@@ -22,6 +22,8 @@
private String stationName;
@ApiModelProperty(value = "品类")
private String categoryName;
+ @ApiModelProperty(value = "父品类")
+ private String parentCategoryName;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@ApiModelProperty(value = "等级-FLOWER_LEVEL")
--
Gitblit v1.9.3