From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index 66569b7..cdd7810 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.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_config")
+@ExcelIgnoreUnannotated
public class SysConfig implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鍙傛暟涓婚敭
*/
- @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
+ @ExcelProperty(value = "鍙傛暟涓婚敭")
@TableId(value = "config_id", type = IdType.AUTO)
private Long configId;
/**
* 鍙傛暟鍚嶇О
*/
- @Excel(name = "鍙傛暟鍚嶇О")
+ @ExcelProperty(value = "鍙傛暟鍚嶇О")
@NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
private String configName;
@@ -46,7 +48,7 @@
/**
* 鍙傛暟閿悕
*/
- @Excel(name = "鍙傛暟閿悕")
+ @ExcelProperty(value = "鍙傛暟閿悕")
@NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String configKey;
@@ -54,7 +56,7 @@
/**
* 鍙傛暟閿��
*/
- @Excel(name = "鍙傛暟閿��")
+ @ExcelProperty(value = "鍙傛暟閿��")
@NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
private String configValue;
@@ -62,7 +64,8 @@
/**
* 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
*/
- @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄�,N=鍚�")
+ @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
/**
@@ -75,7 +78,6 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -88,7 +90,6 @@
* 鏇存柊鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
--
Gitblit v1.9.3