From c5dc08e0824250daa3bc6aabbca364de95d8d0f5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 10:45:04 +0800
Subject: [PATCH] update 调整 角色查询部门 返回值类型
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 66 +++++++++++---------------------
1 files changed, 23 insertions(+), 43 deletions(-)
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 e8bc0f1..3c572bd 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
@@ -2,51 +2,54 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 瀛楀吀鏁版嵁琛� sys_dict_data
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dict_data")
@ExcelIgnoreUnannotated
-public class SysDictData implements Serializable {
- private static final long serialVersionUID = 1L;
+@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄")
+public class SysDictData extends BaseEntity {
/**
* 瀛楀吀缂栫爜
*/
+ @ApiModelProperty(value = "瀛楀吀缂栫爜")
@ExcelProperty(value = "瀛楀吀缂栫爜")
- @TableId(value = "dict_code", type = IdType.AUTO)
+ @TableId(value = "dict_code")
private Long dictCode;
/**
* 瀛楀吀鎺掑簭
*/
+ @ApiModelProperty(value = "瀛楀吀鎺掑簭")
@ExcelProperty(value = "瀛楀吀鎺掑簭")
private Long dictSort;
/**
* 瀛楀吀鏍囩
*/
+ @ApiModelProperty(value = "瀛楀吀鏍囩")
@ExcelProperty(value = "瀛楀吀鏍囩")
@NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -55,6 +58,7 @@
/**
* 瀛楀吀閿��
*/
+ @ApiModelProperty(value = "瀛楀吀閿��")
@ExcelProperty(value = "瀛楀吀閿��")
@NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
@Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
@@ -63,6 +67,7 @@
/**
* 瀛楀吀绫诲瀷
*/
+ @ApiModelProperty(value = "瀛楀吀绫诲瀷")
@ExcelProperty(value = "瀛楀吀绫诲瀷")
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -71,17 +76,20 @@
/**
* 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�
*/
+ @ApiModelProperty(value = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�")
@Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
private String cssClass;
/**
* 琛ㄦ牸瀛楀吀鏍峰紡
*/
+ @ApiModelProperty(value = "琛ㄦ牸瀛楀吀鏍峰紡")
private String listClass;
/**
* 鏄惁榛樿锛圷鏄� N鍚︼級
*/
+ @ApiModelProperty(value = "鏄惁榛樿锛圷鏄� N鍚︼級")
@ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String isDefault;
@@ -89,47 +97,19 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
+ @ApiModelProperty(value = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
+ @ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
-
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
public boolean getDefault() {
- return UserConstants.YES.equals(this.isDefault) ? true : false;
+ return UserConstants.YES.equals(this.isDefault);
}
}
--
Gitblit v1.9.3