From 3414326f13fcd0f5dc88b8a7e69db96f66b1d363 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 09:21:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
index a1134e9..4c858c9 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
@@ -72,6 +72,14 @@
 	@Excel(name = "鍨嬪彿/鍥惧彿", width = 15)
     @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
     private String toolModel;
+    /**鍒�鍏锋潗鏂�*/
+    @Excel(name = "鍒�鍏锋潗鏂�", width = 15)
+    @ApiModelProperty(value = "鍒�鍏锋潗鏂�")
+    private String toolMaterial;
+    /**闆朵欢鏉愭枡*/
+    @Excel(name = "闆朵欢鏉愭枡", width = 15)
+    @ApiModelProperty(value = "闆朵欢鏉愭枡")
+    private String partMaterial;
 	/**澶囨敞*/
 	@Excel(name = "澶囨敞", width = 15)
     @ApiModelProperty(value = "澶囨敞")

--
Gitblit v1.9.3