From 938ca5c451a9fb7bf640b802a2972d67846a43a9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 12 四月 2021 17:09:05 +0800 Subject: [PATCH] fix 补全缺包 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 11 +++++ ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 8 ++++ ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 10 +++- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 8 ++++ ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++++ ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 12 +++++ ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 8 ++++ ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 12 +++++ ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 8 ++++ 9 files changed, 79 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index d082aa9..2037058 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -9,9 +9,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 閮ㄩ棬琛� sys_dept @@ -88,4 +86,10 @@ @TableField(exist = false) private List<SysDept> children = new ArrayList<SysDept>(); + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index 737966a..eb81dea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -12,6 +12,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 瀛楀吀鏁版嵁琛� sys_dict_data @@ -88,6 +90,12 @@ /** 澶囨敞 */ private String remark; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + public boolean getDefault() { return UserConstants.YES.equals(this.isDefault) ? true : false; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 88754b7..09ca5f1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -11,6 +11,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 瀛楀吀绫诲瀷琛� sys_dict_type @@ -66,4 +68,10 @@ /** 澶囨敞 */ private String remark; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 4ada2c2..5c86436 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -11,6 +11,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 瑙掕壊琛� sys_role @@ -85,6 +87,12 @@ /** 澶囨敞 */ private String remark; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */ @TableField(exist = false) private boolean flag = false; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 25d915e..73a0561 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -16,7 +16,9 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 鐢ㄦ埛瀵硅薄 sys_user @@ -113,6 +115,12 @@ /** 澶囨敞 */ private String remark; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + /** 閮ㄩ棬瀵硅薄 */ @Excels({ @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), 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 82219a7..22fb843 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 @@ -1,15 +1,19 @@ package com.ruoyi.system.domain; 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.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; -import lombok.*; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 绯荤粺璁块棶璁板綍琛� sys_logininfor @@ -80,4 +84,10 @@ @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date loginTime; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 073a837..a78636d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,12 +2,15 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 閫氱煡鍏憡琛� sys_notice @@ -78,4 +81,10 @@ */ private String remark; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + } 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 58b1943..87deccf 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 @@ -1,15 +1,19 @@ package com.ruoyi.system.domain; 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.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; -import lombok.*; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 鎿嶄綔鏃ュ織璁板綍琛� oper_log @@ -127,4 +131,10 @@ @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime; + /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + } 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 05bc369..cafd0a7 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 @@ -11,6 +11,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 宀椾綅琛� sys_post @@ -91,6 +93,12 @@ private String remark; /** + * 璇锋眰鍙傛暟 + */ + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); + + /** * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦� */ @TableField(exist = false) -- Gitblit v1.9.3