From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 ac07e41..2a7b05a 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -32,9 +32,9 @@
// 搴忓垪鐮�
private String batch = "";
private String brand = "";
- private String standby1 = "";
- private String standby2 = "";
- private String standby3 = "";
+ private String standby1 = "1";
+ private String standby2 = "1";
+ private String standby3 = "1";
private String boxType1 = "1";
private String boxType2 = "1";
@@ -44,10 +44,16 @@
private Double anfme;
// 鍟嗗搧鍚嶇О
- private String maktx;
+ private String maktx = "";
// 瑙勬牸
- private String specs;
+ private String specs = "";
+ private String supp = "";
+
+ // sku
+ private String sku = "";
+ //澶囨敞
+ private String memo = "";
}
--
Gitblit v1.9.1