From 0fdd97203f1f8a7f3e4df221e8d79a4f387d14d6 Mon Sep 17 00:00:00 2001 From: Yjoioooo <5403234+zj_Gitttttttte@user.noreply.gitee.com> Date: 星期一, 06 三月 2023 19:07:00 +0800 Subject: [PATCH] !296 add 新增租户套餐同步功能 * update 修改按钮简化为同步套餐 * update 修改同步租户套餐接口message错误描述 * update 修改同步租户套餐权限字符 * update 修改状态修改权限字符 * add 租户管理新增租户套餐同步功能 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java index c66d066..3efdefd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java @@ -2,7 +2,9 @@ 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.SysDept; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -18,13 +20,19 @@ @Data @EqualsAndHashCode(callSuper = true) -public class SysDeptBo extends TreeEntity<SysDeptBo> { +@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) +public class SysDeptBo extends BaseEntity { /** * 閮ㄩ棬id */ @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = { EditGroup.class }) private Long deptId; + + /** + * 鐖堕儴闂↖D + */ + private Long parentId; /** * 閮ㄩ棬鍚嶇О @@ -37,7 +45,7 @@ * 鏄剧ず椤哄簭 */ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - private Long orderNum; + private Integer orderNum; /** * 璐熻矗浜� -- Gitblit v1.9.3