From d7a7f6f1b43c90e556616883a08a4d9fa53e9529 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Tue, 16 Apr 2024 08:54:17 +0800
Subject: [PATCH] '123'

---
 .../main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java  | 2 +-
 .../src/main/java/com/ruoyi/material/domain/CMaterial.java  | 2 +-
 .../java/com/ruoyi/materialType/domain/CMaterialType.java   | 2 +-
 ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
index b2339e9..572b5ed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
@@ -33,7 +33,7 @@ public class CYlMaterial extends BaseEntity
     private BigDecimal materialPrice;
 
     /** 停用状态 */
-    @Excel(name = "停用状态")
+    @Excel(name = "停用状态",dictType  = "yl_material_state")
     private String materialState;
 
     public void setMaterialId(Long materialId)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
index 2f2ddc7..23f9b4a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
@@ -44,7 +44,7 @@ public class CMaterial extends BaseEntity
     private String typeName;
 
     /** 物料状态 */
-    @Excel(name = "物料状态")
+    @Excel(name = "物料状态",dictType  = "material_state")
     private String materialState;
 
     /** 物料成本信息 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java b/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
index 0cefb73..4fa1d4e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
@@ -28,7 +28,7 @@ public class CMaterialType extends BaseEntity
     private String typeName;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态",dictType  = "material_type_state")
     private String typeState;
 
     public void setTypeId(Long typeId)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
index ebcabbe..59e3883 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
@@ -50,7 +50,7 @@ public class Quot extends BaseEntity
     private String quotPhone;
 
     /** 询价日期 */
-    @Excel(name = "询价日期")
+    @Excel(name = "询价日期",dateFormat = "yyyy-MM-dd hh:MM:ss")
     private Date quotInquiryDate;
 
     /** 项目名称 */
@@ -58,7 +58,7 @@ public class Quot extends BaseEntity
     private String quotProject;
 
     /** 报价日期 */
-    @Excel(name = "报价日期")
+    @Excel(name = "报价日期",dateFormat = "yyyy-MM-dd hh:MM:ss")
     private Date quotQuotationDate;
 
     /** 报价来源 */
@@ -88,7 +88,7 @@ public class Quot extends BaseEntity
     private String quotCheckUserNickname;
 
     /** 提交状态 */
-    @Excel(name = "提交状态")
+    @Excel(name = "提交状态",dictType  = "quot_approval_status")
     private String quotApprovalStatus;
 
     /** 创建人 */