From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 63f117a..0f663b5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -55,14 +55,14 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
/**
* 浠撳簱鍙�
--
Gitblit v1.9.1