From fa5b8238f31749cc4b0469df317b5849da08a419 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期日, 30 三月 2025 14:53:15 +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/Warehouse.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
index 61fedef..7f678d1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
@@ -146,6 +146,14 @@
     @ApiModelProperty("搴撳尯")
     private List<WarehouseAreas> children;
 
+
+    @TableField(exist = false)
+    private Integer flagWare;
+
+    @TableField(exist = false)
+    @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+    private Long index;
+
     public Warehouse() {}
 
     public Warehouse(String name,String code,String factory,String address,String longitude,String latgitude,Double length,Double width,Double height,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {

--
Gitblit v1.9.1