From 91d05844fa5d170face76455d38a330f24e214bc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 十一月 2022 13:58:26 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs 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