From edbf54064b70a6311a98eeefc7516a35287e6b44 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 08 五月 2022 15:28:00 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 cb30c4b..84a4927 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -22,13 +22,13 @@
     public static class CombMat {
 
         // 鐗╂枡缂栧彿
-        private String matNo;
+        private String matnr;
 
-        // 鎵瑰彿
+        // 搴忓垪鐮�
         private String batch;
 
         // 鐗╂枡鏁伴噺
-        private Double count;
+        private Double anfme;
 
     }
 

--
Gitblit v1.9.1