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/SysOperLog.java | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 8b14c36..0486569 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -2,16 +2,14 @@ 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 com.ruoyi.common.excel.annotation.ExcelDictFormat; +import com.ruoyi.common.excel.convert.ExcelDictConvert; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -20,25 +18,22 @@ /** * 鎿嶄綔鏃ュ織璁板綍琛� oper_log * - * @author ruoyi + * @author Lion Li */ @Data -@NoArgsConstructor -@Accessors(chain = true) @TableName("sys_oper_log") @ExcelIgnoreUnannotated -//@ColumnWidth(16) -//@HeadRowHeight(14) -//@HeadFontStyle(fontHeightInPoints = 11) public class SysOperLog implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** * 鏃ュ織涓婚敭 */ - @ExcelProperty(value = "鎿嶄綔搴忓彿") - @TableId(value = "oper_id", type = IdType.AUTO) + @ExcelProperty(value = "鏃ュ織涓婚敭") + @TableId(value = "oper_id") private Long operId; /** @@ -51,7 +46,7 @@ * 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛� */ @ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_oper_type") + @ExcelDictFormat(dictType = "sys_oper_type") private Integer businessType; /** @@ -76,7 +71,7 @@ * 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 */ @ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�") + @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�") private Integer operatorType; /** @@ -125,7 +120,7 @@ * 鎿嶄綔鐘舵�侊紙0姝e父 1寮傚父锛� */ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_common_status") private Integer status; /** -- Gitblit v1.9.3