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/TestDemoImportVo.java | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java index 2150cdf..8f417fb 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java @@ -1,13 +1,7 @@ package com.ruoyi.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.core.domain.BaseEntity; -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; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -18,16 +12,12 @@ * @author Lion Li * @date 2021-07-26 */ - @Data -@ApiModel("娴嬭瘯鍗曡〃涓氬姟瀵硅薄") public class TestDemoImportVo { - /** * 閮ㄩ棬id */ - @ApiModelProperty("閮ㄩ棬id") @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖") @ExcelProperty(value = "閮ㄩ棬id") private Long deptId; @@ -35,7 +25,6 @@ /** * 鐢ㄦ埛id */ - @ApiModelProperty("鐢ㄦ埛id") @NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖") @ExcelProperty(value = "鐢ㄦ埛id") private Long userId; @@ -43,7 +32,6 @@ /** * 鎺掑簭鍙� */ - @ApiModelProperty("鎺掑簭鍙�") @NotNull(message = "鎺掑簭鍙蜂笉鑳戒负绌�") @ExcelProperty(value = "鎺掑簭鍙�") private Long orderNum; @@ -51,7 +39,6 @@ /** * key閿� */ - @ApiModelProperty("key閿�") @NotBlank(message = "key閿笉鑳戒负绌�") @ExcelProperty(value = "key閿�") private String testKey; @@ -59,8 +46,8 @@ /** * 鍊� */ - @ApiModelProperty("鍊�") @NotBlank(message = "鍊间笉鑳戒负绌�") @ExcelProperty(value = "鍊�") private String value; + } -- Gitblit v1.9.3