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/MatCode.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 10d2feb..9222313 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -30,7 +30,7 @@
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "鏉″舰鐮�")
private String barcode;
/**
@@ -46,9 +46,6 @@
@ApiModelProperty(value= "鐗╂枡鍗曚綅")
private String str1;
- /**
- * 鐗╂枡瑙勬牸
- */
@ApiModelProperty(value= "鐗╂枡瑙勬牸")
private String str2;
--
Gitblit v1.9.1