From 598a8da13e64b182312e5e14bfeba132f0422cd1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 16:08:02 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index b79839c..ef2ea78 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,11 +37,11 @@
     @ApiModelProperty(value= "瑙勬牸")
     private String lgnum;
 
-    @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+    @ApiModelProperty(value= "鐗╂枡绫诲埆")
     private String type;
 
-    @ApiModelProperty(value= "鍔╄鐮�")
-    private String mnemonic;
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
 
     @ApiModelProperty(value= "渚涘簲鍟�")
     private String supplier;

--
Gitblit v1.9.1