From f10169ec96e281abd2d68064ca855e48e9dc9e6a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 20 六月 2022 15:54:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
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