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/controller/MatController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 533c8a4..cb362ea 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -276,6 +276,8 @@
             print.setBarcode(mat.getBarcode());
             print.setMaktx(mat.getMaktx());
             print.setSpecs(mat.getSpecs());
+            print.setSupp(mat.getSupp());
+            print.setSku(mat.getSku());
             print.setUnit(mat.getUnit());
             print.setMemo(mat.getMemo());
             res.add(print);

--
Gitblit v1.9.1