From 342e2b3a98a33c0f64893986fc9ceae8cdd10b23 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 22:01:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 84a4927..b655332 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,6 +16,9 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 鏄惁鍐荤粨
+ private Integer frozen;
+
private List<CombMat> combMats;
@Data
@@ -30,6 +33,9 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+ // 澶囨敞
+ private String memo;
+
}
}
--
Gitblit v1.9.1