From 37175875537a92930a19688ad1cc2c49fb415f0f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 01 八月 2025 14:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java
index 454c893..aeb017d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java
@@ -11,7 +11,6 @@
     @TableId(type = IdType.AUTO)
 
     private Long id;
-    private Integer operateTypeId;
     private String operateTypeName;
     private String operateType;
     private String type;

--
Gitblit v1.8.0