From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

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

diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
index b7c8bb2..b4bb1b9 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -120,7 +120,7 @@
     private String err;
 
     /**
-     * 寮傚父鎯呭喌 1: 鏈鐞�  2: 宸蹭慨澶�  
+     * 寮傚父鎯呭喌 1: 鏈鐞�  2: 宸蹭慨澶�
      */
     @ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞�  2: 宸蹭慨澶�  ")
     private Integer status;

--
Gitblit v1.9.1