From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowAllFlowCardVO.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowAllFlowCardVO.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowAllFlowCardVO.java
index 54001ec..f6f6ac3 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowAllFlowCardVO.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowAllFlowCardVO.java
@@ -15,15 +15,23 @@
     /**
      * 娴佺▼鍗″彿
      */
-    private String FlowCardId;
+    private String flowCardId;
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    private String customerName;
     /**
      * 浜у搧鍚嶇О
      */
-    private String ProductName;
+    private String productName;
     /**
      * 鏄惁鐩撮��
      */
     private Boolean isThroughSlot;
+    /**
+     * 宸查厤瀵规�绘暟閲�
+     */
+    private int pairTotalCount;
 
     /**
      * 娴佺▼鍗℃暟鎹�

--
Gitblit v1.8.0