From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/java/com/zy/asrs/entity/WrkDetl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 58cbe5b..db9451b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -40,7 +40,7 @@
     /**
      * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "浠撳簱鍙�")
+    @ApiModelProperty(value= "瑙勬牸")
     private String lgnum;
 
     /**
@@ -58,7 +58,7 @@
     /**
      * 鐗╂枡鏍囩ID
      */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
+    @ApiModelProperty(value= "棰滆壊")
     private String zmatid;
 
     /**

--
Gitblit v1.9.1