From 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期四, 05 六月 2025 15:24:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 10 ++++++++++ 1 files changed, 10 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 d1d5cfd..761e0f4 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -22,8 +22,12 @@ private List<CombMat> combMats; + @Data public static class CombMat { + + // 鏉$爜 + private String threeCode; // 鐗╂枡缂栧彿 private String matnr; @@ -40,6 +44,12 @@ // 瑙勬牸 private String specs; + private String supp; + + private String temp1; + + private String temp2; + } } -- Gitblit v1.9.1