From fe739bd754d999f18094527ed3bca7a23f8a2ddf Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:11:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/entity/BasErrLog.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index ded8ca1..85ff2b2 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -131,9 +131,9 @@
private String error;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 寮傚父鎯呭喌 1: 寰呭鐞� 2: 宸蹭慨澶�
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ @ApiModelProperty(value= "寮傚父鎯呭喌 1: 寰呭鐞� 2: 宸蹭慨澶� ")
private Integer status;
/**
@@ -388,7 +388,7 @@
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "鏈鐞�";
+ return "寰呭鐞�";
case 2:
return "宸蹭慨澶�";
default:
--
Gitblit v1.9.1