From 9ce776b85466ff5a779f6371bc7b38cf48615087 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Fri, 23 May 2025 16:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90-=E5=B0=8F=E6=9D=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=93=81=E7=89=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/controller/admin/plan/vo/PlateDetailRespVO.java   | 2 ++
 .../src/main/resources/mapper/planitem/PlanItemMapper.xml      | 3 ++-
 .../src/main/resources/mapper/plate/PlateMapper.xml            | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
index 5c72f29f6..e1f53e5dd 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
@@ -59,6 +59,8 @@ public class PlateDetailRespVO {
     @Schema(description = "板颜色", requiredMode = Schema.RequiredMode.REQUIRED)
     private  String color;
 
+    @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String brand;
 
     @Schema(description = "板材质", requiredMode = Schema.RequiredMode.REQUIRED)
     private  String material;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
index b5a7b376f..b47554e29 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
@@ -352,6 +352,7 @@
         <result property="width" column="width"/>
         <result property="color" column="color"/>
         <result property="material" column="material"/>
+        <result property="brand" column="brand"/>
         <result property="thickness" column="thickness"/>
         <result property="splitWidth" column="splitWidth"/>
         <result property="splitHeight" column="splitHeight"/>
@@ -419,7 +420,7 @@
             ob.room_name as roomName,
             ogs.goods_id as plateGoodsId,
             ogs.goods_name as goodsName,
-
+            ogs.brand as brand,
             ogs.color as color,
             ogs.material as material,
             op.id as plateId,
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index d5a7dbfa1..e01c1d138 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -31,6 +31,7 @@
         <result property="name" column="name"/>
         <result property="color" column="color"/>
         <result property="material" column="material"/>
+        <result property="brand" column="brand"/>
         <result property="height" column="height"/>
         <result property="width" column="width"/>
         <result property="thickness" column="thickness"/>
@@ -391,7 +392,7 @@
         ob.room_name as roomName,
         ogs.goods_id as plateGoodsId,
         ogs.goods_name as goodsName,
-
+        ogs.brand as brand,
         ogs.color as color,
         ogs.material as material,
         op.id as plateId,