From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGlassShelfLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGlassShelfLog.java
index f5ad149..a44efbf 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGlassShelfLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGlassShelfLog.java
@@ -13,7 +13,7 @@
     private Long id;
     private String documentId;
     private Integer documentNumber;
-    private String type;
+    private Integer type;
     private String glassShelfName;
     private String glassShelfNumber;
     private Integer quantity;

--
Gitblit v1.8.0