From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 e07af37..f9fa8da 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
@@ -95,6 +95,12 @@
     private Date arrTime;
 
     /**
+     * 璐ㄦ涓婃姤鐘舵��
+     */
+    @ApiModelProperty("涓婃姤鐘舵�� 0锛氭湭涓婃姤, 1锛氬凡涓婃姤")
+    private Integer ntyStatus;
+
+    /**
      * 閲婃斁鐘舵�� 0:  姝e父   1:  宸查噴鏀�  
      */
     @ApiModelProperty(value= "閲婃斁鐘舵�� 0:  姝e父   1:  宸查噴鏀�  ")

--
Gitblit v1.9.1