From 2a96427d46697e1d99e5ad78b3ac441f999dd600 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 27 八月 2025 18:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/RatedLife.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java b/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java
index 743b44c..dea06b6 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/RatedLife.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