From c00c9ba386b367deb76fa438eaed9ef5dd371d03 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 27 三月 2023 14:00:21 +0800 Subject: [PATCH] !314 遗漏数据验证后return Merge pull request !314 from Yjoioooo/5.X --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java index 4770d9d..5cb977d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java @@ -3,31 +3,36 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysMenu; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import java.util.Date; - -import com.ruoyi.common.mybatis.core.domain.BaseEntity; /** * 鑿滃崟鏉冮檺涓氬姟瀵硅薄 sys_menu * - * @author ruoyi - * @date 2023-02-01 + * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -public class SysMenuBo extends TreeEntity<SysMenuBo> { +@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) +public class SysMenuBo extends BaseEntity { /** * 鑿滃崟ID */ @NotNull(message = "鑿滃崟ID涓嶈兘涓虹┖", groups = { EditGroup.class }) private Long menuId; + + /** + * 鐖惰彍鍗旾D + */ + private Long parentId; /** * 鑿滃崟鍚嶇О @@ -62,12 +67,12 @@ /** * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級 */ - private Integer isFrame; + private String isFrame; /** * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級 */ - private Integer isCache; + private String isCache; /** * 鑿滃崟绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛� -- Gitblit v1.9.3