From 8d0b466ef4fe497932e15c186688679e55a26f62 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java | 1 +
1 files changed, 1 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 4b6649c..f9c7d7b 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
@@ -55,6 +55,7 @@
/**鍒�鍏稩D*/
@Excel(name = "鍒�鍏稩D", width = 15)
@ApiModelProperty(value = "鍒�鍏稩D")
+ @Dict(dictTable = "cms_cutting_tool",dicCode="id",dicText = "cutting_code")
private String cuttingId;
/**鍒�鍏锋潯鐮�*/
@Excel(name = "鍒�鍏锋潯鐮�", width = 15)
--
Gitblit v1.9.3