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/CuttingInboundDetail.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
index fd987e0..76e228b 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
@@ -48,7 +48,7 @@
@ApiModelProperty(value = "鍏ュ簱鍗�")
private String orderId;
/**鍒�鍏稩D*/
- @Excel(name = "鍒�鍏稩D", width = 15)
+ @Excel(name = "鍒�鍏稩D", width = 15,dictTable = "cms_cutting_tool",dicCode = "id",dicText = "cutting_code")
@ApiModelProperty(value = "鍒�鍏稩D")
private String cuttingId;
/**鍏ュ簱鏁伴噺*/
--
Gitblit v1.9.3