From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
index c561dd7..a51b3fe 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
@@ -3,8 +3,6 @@
import com.ruoyi.common.core.domain.TreeEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,35 +18,30 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("娴嬭瘯鏍戣〃涓氬姟瀵硅薄")
-public class TestTreeBo extends TreeEntity {
+public class TestTreeBo extends TreeEntity<TestTreeBo> {
/**
* 涓婚敭
*/
- @ApiModelProperty("涓婚敭")
- @NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = { EditGroup.class })
+ @NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {EditGroup.class})
private Long id;
/**
* 閮ㄩ棬id
*/
- @ApiModelProperty("閮ㄩ棬id")
- @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @ApiModelProperty("鐢ㄦ埛id")
- @NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 鏍戣妭鐐瑰悕
*/
- @ApiModelProperty("鏍戣妭鐐瑰悕")
- @NotBlank(message = "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private String treeName;
}
--
Gitblit v1.9.3