From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGlassShelfLog.java | 3 ++-
1 files changed, 2 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..a3ead2e 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;
@@ -25,6 +25,7 @@
private Double maxWidth;
private Double maxHeight;
private LocalDate createTime;
+ private String operator;
--
Gitblit v1.8.0