From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 898aa8a..f95b332 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -2,15 +2,12 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -20,12 +17,10 @@
/**
* 绯荤粺璁块棶璁板綍琛� sys_logininfor
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
public class SysLogininfor implements Serializable {
@@ -35,7 +30,7 @@
* ID
*/
@ExcelProperty(value = "搴忓彿")
- @TableId(value = "info_id", type = IdType.AUTO)
+ @TableId(value = "info_id")
private Long infoId;
/**
@@ -48,7 +43,7 @@
* 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触
*/
@ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
+ @ExcelDictFormat(dictType = "sys_common_status")
private String status;
/**
--
Gitblit v1.9.3