From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 17 +----------------
1 files changed, 1 insertions(+), 16 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 241aecd..e20f96a 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
@@ -8,11 +8,8 @@
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.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -25,16 +22,13 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dict_data")
@ExcelIgnoreUnannotated
-@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄")
public class SysDictData extends BaseEntity {
/**
* 瀛楀吀缂栫爜
*/
- @ApiModelProperty(value = "瀛楀吀缂栫爜")
@ExcelProperty(value = "瀛楀吀缂栫爜")
@TableId(value = "dict_code")
private Long dictCode;
@@ -42,14 +36,12 @@
/**
* 瀛楀吀鎺掑簭
*/
- @ApiModelProperty(value = "瀛楀吀鎺掑簭")
@ExcelProperty(value = "瀛楀吀鎺掑簭")
- private Long dictSort;
+ private Integer dictSort;
/**
* 瀛楀吀鏍囩
*/
- @ApiModelProperty(value = "瀛楀吀鏍囩")
@ExcelProperty(value = "瀛楀吀鏍囩")
@NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -58,7 +50,6 @@
/**
* 瀛楀吀閿��
*/
- @ApiModelProperty(value = "瀛楀吀閿��")
@ExcelProperty(value = "瀛楀吀閿��")
@NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
@Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
@@ -67,7 +58,6 @@
/**
* 瀛楀吀绫诲瀷
*/
- @ApiModelProperty(value = "瀛楀吀绫诲瀷")
@ExcelProperty(value = "瀛楀吀绫诲瀷")
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -76,20 +66,17 @@
/**
* 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�
*/
- @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;
@@ -97,7 +84,6 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ApiModelProperty(value = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
@@ -105,7 +91,6 @@
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
public boolean getDefault() {
--
Gitblit v1.9.3