From a1844a7fc934ca943db810b1bd2a450f948607cd Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 03 六月 2021 14:23:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htasrs0' into htasrs0
---
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 4760530..d823559 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -29,12 +29,12 @@
private String brand; // 鍝佺墝
private String loc_no; //搴撲綅鍙�
- private String mat_no; //鐗╂枡缂栫爜
+ private String mat_no; //鍟嗗搧缂栧彿
private Long ctns; //绠辨暟
private Long qty; //鏁伴噺
private double wt; //閲嶉噺
private String memo; //澶囨敞
- private String mat_name; //鐗╂枡鍚嶇О
+ private String mat_name; //鍟嗗搧鍚嶇О
private String str1;
private String str2;
private String str3;
--
Gitblit v1.9.1