From 400a141a0d510e825bac830561ea010cdbb44bce Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Fri, 15 Nov 2024 22:43:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/warehouseGoods/dto/CreateWarehouseGoodsDto.java     | 5 +++++
 .../coal/warehouseGoods/dto/UpdateWarehouseGoodsDto.java     | 5 +++++
 .../lihongjie/coal/warehouseGoods/dto/WarehouseGoodsDto.java | 5 +++++
 .../coal/warehouseGoods/entity/WarehouseGoodsEntity.java     | 5 +++++
 .../warehouseGoodsSummary/dto/WarehouseGoodsSummaryDto.java  | 3 +++
 .../entity/WarehouseGoodsSummaryEntity.java                  | 4 ++++
 6 files changed, 27 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/CreateWarehouseGoodsDto.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/CreateWarehouseGoodsDto.java
index 316a500e..d94b5f32 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/CreateWarehouseGoodsDto.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/CreateWarehouseGoodsDto.java
@@ -41,6 +41,11 @@ public class CreateWarehouseGoodsDto extends OrgCommonDto {
     private String spec;
 
 
+    @Comment("型号")
+
+    private String model;
+
+
     @Comment("重量 kg")
     private Double weight;
 
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/UpdateWarehouseGoodsDto.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/UpdateWarehouseGoodsDto.java
index e68f3c06..3fa2640a 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/UpdateWarehouseGoodsDto.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/UpdateWarehouseGoodsDto.java
@@ -39,6 +39,11 @@ public class UpdateWarehouseGoodsDto extends OrgCommonDto {
     private String spec;
 
 
+    @Comment("型号")
+
+    private String model;
+
+
     @Comment("重量 kg")
     private Double weight;
 
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/WarehouseGoodsDto.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/WarehouseGoodsDto.java
index a28092f6..a1c2d4d0 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/WarehouseGoodsDto.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/WarehouseGoodsDto.java
@@ -41,6 +41,11 @@ public class WarehouseGoodsDto extends OrgCommonDto {
     private String spec;
 
 
+    @Comment("型号")
+
+    private String model;
+
+
     @Comment("重量 kg")
     private Double weight;
 
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
index 3e52d2bf..9549c247 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
@@ -51,9 +51,14 @@ public class WarehouseGoodsEntity extends OrgCommonEntity {
     private String spec;
 
 
+    @Comment("型号")
+
+    private String model;
+
     @Comment("重量 kg")
     private Double weight;
 
+
     @Comment("体积 m3")
     private Double volume;
 
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/dto/WarehouseGoodsSummaryDto.java b/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/dto/WarehouseGoodsSummaryDto.java
index a9a19f09..637bc9e0 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/dto/WarehouseGoodsSummaryDto.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/dto/WarehouseGoodsSummaryDto.java
@@ -46,6 +46,9 @@ public class WarehouseGoodsSummaryDto extends OrgCommonDto {
     @Comment("规格")
     private String spec;
 
+    @Comment("型号")
+
+    private String model;
 
     @Comment("重量 kg")
     private Double weight;
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/entity/WarehouseGoodsSummaryEntity.java b/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/entity/WarehouseGoodsSummaryEntity.java
index fd5a355c..cfd7ea31 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/entity/WarehouseGoodsSummaryEntity.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/entity/WarehouseGoodsSummaryEntity.java
@@ -41,6 +41,7 @@ select
        g.price5,
        g.size,
        g.spec,
+       g.model,
        g.volume,
        g.weight,
        g.brand_id,
@@ -101,6 +102,9 @@ public class WarehouseGoodsSummaryEntity extends OrgCommonEntity {
     @Comment("规格")
     private String spec;
 
+    @Comment("型号")
+
+    private String model;
 
     @Comment("重量 kg")
     private Double weight;