From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 05bc369..5672250 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -1,16 +1,20 @@
 package com.ruoyi.system.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 宀椾綅琛� sys_post
@@ -22,20 +26,21 @@
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_post")
-public class SysPost {
+@ExcelIgnoreUnannotated
+public class SysPost implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 宀椾綅搴忓彿
      */
-    @Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC)
+    @ExcelProperty(value = "宀椾綅搴忓彿")
     @TableId(value = "post_id", type = IdType.AUTO)
     private Long postId;
 
     /**
      * 宀椾綅缂栫爜
      */
-    @Excel(name = "宀椾綅缂栫爜")
+    @ExcelProperty(value = "宀椾綅缂栫爜")
     @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
     @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�")
     private String postCode;
@@ -43,7 +48,7 @@
     /**
      * 宀椾綅鍚嶇О
      */
-    @Excel(name = "宀椾綅鍚嶇О")
+    @ExcelProperty(value = "宀椾綅鍚嶇О")
     @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
     private String postName;
@@ -51,38 +56,39 @@
     /**
      * 宀椾綅鎺掑簭
      */
-    @Excel(name = "宀椾綅鎺掑簭")
+    @ExcelProperty(value = "宀椾綅鎺掑簭")
     @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
     private String postSort;
 
     /**
      * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
      */
-    @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+	@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+	@ExcelDictFormat(dictType = "sys_common_status")
     private String status;
 
     /**
      * 鍒涘缓鑰�
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 鏇存柊鑰�
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /**
      * 鏇存柊鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
@@ -91,6 +97,12 @@
     private String remark;
 
     /**
+     * 璇锋眰鍙傛暟
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
      * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�
      */
     @TableField(exist = false)

--
Gitblit v1.9.3