From 94be46d065691d45d95527d748d85d5496af6b79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 26 八月 2021 18:03:33 +0800
Subject: [PATCH] fix 修复定时器工具编写错误问题
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 5bde684..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,9 +1,10 @@
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;
@@ -25,20 +26,21 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_post")
+@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;
@@ -46,7 +48,7 @@
/**
* 宀椾綅鍚嶇О
*/
- @Excel(name = "宀椾綅鍚嶇О")
+ @ExcelProperty(value = "宀椾綅鍚嶇О")
@NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String postName;
@@ -54,14 +56,15 @@
/**
* 宀椾綅鎺掑簭
*/
- @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;
/**
@@ -74,7 +77,6 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -87,7 +89,6 @@
* 鏇存柊鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
--
Gitblit v1.9.3