'123'

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)

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;
 
     /** 物料成本信息 */

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)

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;
 
     /** 创建人 */