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

diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index bfa7e5d..10d2feb 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -52,10 +52,10 @@
     @ApiModelProperty(value= "鐗╂枡瑙勬牸")
     private String str2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "棰滆壊")
     private String str3;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "瀹㈡埛")
     private String str4;
 
     @ApiModelProperty(value= "")
@@ -115,7 +115,7 @@
     @ApiModelProperty(value= "")
     private String str23;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "閲嶉噺")
     private Double num1;
 
     @ApiModelProperty(value= "")

--
Gitblit v1.9.1