From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
index 61c03b7..196cbe4 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
@@ -77,4 +77,11 @@
@TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
private String cuttingBarcodeSearch;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private String workpieceMaterial;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private BigDecimal ratedLife;
+
}
--
Gitblit v1.9.3