From 6704225b102b684e6ce4e88fa897414fac06c9f1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 26 四月 2021 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 6e1815a..86d30fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -15,7 +15,7 @@
     // 鎴愬搧鐮�
     private String productCode;
 
-    // 鐢熸垚鍗曞彿
+    // 鐢熶骇鍗曞彿
     private String warehouse;
 
     private String billNo;

--
Gitblit v1.9.1