From 5a7683e98e626cba3b52fd621b4d5340e16b6f2a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
index ecebba7..ab9dd3e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
@@ -53,6 +53,16 @@
     private Integer technologyNumber;
 
     /**
+     * 璁㈠崟搴忓彿
+     */
+    private Double width;
+
+    /**
+     * 灞傚彿
+     */
+    private Double height;
+
+    /**
      * 璁㈠崟鏁伴噺
      */
     private Integer quantity;
@@ -75,7 +85,7 @@
     /**
      * 鐮存崯鏁伴噺
      */
-    private String broken_num;
+    private String brokenNum;
 
     /**
      * 搴撳瓨鏁伴噺

--
Gitblit v1.8.0