From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 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 de095ec..047936f 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
@@ -5,12 +5,11 @@
 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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.excel.annotation.ExcelDictFormat;
+import com.ruoyi.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
@@ -25,14 +24,14 @@
 @Data
 @TableName("sys_logininfor")
 @ExcelIgnoreUnannotated
-@ApiModel("绯荤粺璁块棶璁板綍涓氬姟瀵硅薄")
 public class SysLogininfor implements Serializable {
+
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
      * ID
      */
-    @ApiModelProperty(value = "璁块棶ID")
     @ExcelProperty(value = "搴忓彿")
     @TableId(value = "info_id")
     private Long infoId;
@@ -40,14 +39,12 @@
     /**
      * 鐢ㄦ埛璐﹀彿
      */
-    @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
     @ExcelProperty(value = "鐢ㄦ埛璐﹀彿")
     private String userName;
 
     /**
      * 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触
      */
-    @ApiModelProperty(value = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触")
     @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
@@ -55,49 +52,42 @@
     /**
      * 鐧诲綍IP鍦板潃
      */
-    @ApiModelProperty(value = "鐧诲綍IP鍦板潃")
     @ExcelProperty(value = "鐧诲綍鍦板潃")
     private String ipaddr;
 
     /**
      * 鐧诲綍鍦扮偣
      */
-    @ApiModelProperty(value = "鐧诲綍鍦扮偣")
     @ExcelProperty(value = "鐧诲綍鍦扮偣")
     private String loginLocation;
 
     /**
      * 娴忚鍣ㄧ被鍨�
      */
-    @ApiModelProperty(value = "娴忚鍣ㄧ被鍨�")
     @ExcelProperty(value = "娴忚鍣�")
     private String browser;
 
     /**
      * 鎿嶄綔绯荤粺
      */
-    @ApiModelProperty(value = "鎿嶄綔绯荤粺")
     @ExcelProperty(value = "鎿嶄綔绯荤粺")
     private String os;
 
     /**
      * 鎻愮ず娑堟伅
      */
-    @ApiModelProperty(value = "鎻愮ず娑堟伅")
     @ExcelProperty(value = "鎻愮ず娑堟伅")
     private String msg;
 
     /**
      * 璁块棶鏃堕棿
      */
-    @ApiModelProperty(value = "璁块棶鏃堕棿")
     @ExcelProperty(value = "璁块棶鏃堕棿")
     private Date loginTime;
 
     /**
      * 璇锋眰鍙傛暟
      */
-    @ApiModelProperty(value = "璇锋眰鍙傛暟")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

--
Gitblit v1.9.3