From 8ac573030c8fc795d9a30afb739f44393f8b63eb Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 18 八月 2025 18:03:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java
index 3f184b1..a55dc67 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInbound.java
@@ -61,6 +61,7 @@
/**鍏ュ簱鍗曠姸鎬�*/
@Excel(name = "鍏ュ簱鍗曠姸鎬�", width = 15)
@ApiModelProperty(value = "鍏ュ簱鍗曠姸鎬�")
+ @Dict(dicCode = "order_status")
private String orderStatus;
/**鍏ュ簱浜�*/
@Excel(name = "鍏ュ簱浜�", width = 15)
--
Gitblit v1.9.3