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/ViewWorkInBean.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 2115d8f..0d8a904 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -24,7 +24,7 @@
 
 	private String lgnum;    	//瑙勬牸
 	private String type;		// 鐗╂枡绫诲埆
-	private String mnemonic;	// 鍔╄鐮�
+	private String color;	// 棰滆壊
 	private String supplier;	// 渚涘簲鍟�
 	private String warehouse;	// 浠撳簱
 	private String brand;	// 鍝佺墝

--
Gitblit v1.9.1