From 1bf7a7cb5be7c82a3d0c615429e272fd6860ecbe Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期六, 28 八月 2021 08:28:32 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into HEAD

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 568b7e6..38107d1 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -14,10 +14,10 @@
 
     public static class CombMat {
 
-        // 鐗╂枡缂栧彿
+        // 浜у搧缂栧彿
         private String matNo;
 
-        // 鐗╂枡鏁伴噺
+        // 浜у搧鏁伴噺
         private Double count;
 
         public String getMatNo() {

--
Gitblit v1.9.1