From 3c45b1467ddfb5a55b8bca17e50f8469811782e9 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 12 九月 2025 10:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
index dba3e42..d362d02 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingReceive.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
@@ -61,6 +59,7 @@
/**棰嗙敤鍗曠姸鎬�*/
@Excel(name = "棰嗙敤鍗曠姸鎬�", width = 15)
@ApiModelProperty(value = "棰嗙敤鍗曠姸鎬�")
+ @Dict(dicCode = "order_status")
private String orderStatus;
/**棰嗙敤浜�*/
@Excel(name = "棰嗙敤浜�", width = 15)
@@ -121,4 +120,5 @@
@Excel(name = "褰掕繕纭鎰忚", width = 15)
@ApiModelProperty(value = "褰掕繕纭鎰忚")
private String returnConfirmComment;
+
}
--
Gitblit v1.9.3