From 2b35183407eb7b1b1524f7b101f1098d9caea042 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 15:13:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index 0d1c981..9adbe56 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -110,11 +110,9 @@
     @ApiModelProperty(value= "閲婃斁鐘舵�� 0:  姝e父   1:  宸查噴鏀�  ")
     private Short rleStatus;
 
-    /**
-     * 鍚嶇О
-     */
-//    @ApiModelProperty(value= "鍚嶇О")
-//    private String name;
+
+    @ApiModelProperty("鎵ц鐘舵��")
+    private Short exceStatus;
 
     /**
      * 鐘舵�� 1: 姝e父  0: 鍐荤粨  

--
Gitblit v1.9.1