From d5eb955933d4c7dc1f102d8a688f7447b5a674fd Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 09:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 0988222..1182ad6 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -44,15 +44,16 @@
         private Double anfme;
 
         // 鍟嗗搧鍚嶇О
-        private String maktx;
+        private String maktx = "";
 
         // 瑙勬牸
-        private String specs;
+        private String specs = "";
+        private String supp = "";//supp -> po
 
         // sku
-        private String sku;
+        private String sku = "";
         //澶囨敞
-        private String memo;
+        private String memo = "";
 
     }
 

--
Gitblit v1.9.1