From 2d68b0241edf83823bedba2392b81c9f0957a7d3 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 16:43:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs

---
 src/main/java/com/zy/common/model/LocDto.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 7499953..c059370 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -35,7 +35,7 @@
 
     private String zpallet;
 
-    //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"
+    //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType" color
     private String outOrderNo;
 
     private String luHao;
@@ -44,6 +44,7 @@
 
     private String proType;
 
+    private String color;
 
     public LocDto() {
     }

--
Gitblit v1.9.1