From 816df6ec0a43ef777e0d4cd0daff61f870626d83 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期四, 05 六月 2025 13:53:12 +0800 Subject: [PATCH] feat(system): 添加节假日管理功能- 新增 SysHolidayController、SysHoliday、SysHolidayMapper、SysHolidayServiceImpl 和 ISysHolidayService 类- 实现节假日信息的增删改查和导出功能 - 添加工作日判断方法 - 新增相关 API 接口 --- zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysRole.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysRole.java b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysRole.java index 9ab4e78..50fc0e4 100644 --- a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysRole.java +++ b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysRole.java @@ -1,20 +1,21 @@ package com.zhitan.common.core.domain.entity; -import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.zhitan.common.annotation.Excel; +import com.zhitan.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhitan.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Set; /** * 瑙掕壊琛� sys_role - * + * * @author zhitan */ @TableName("sys_role") @@ -57,15 +58,19 @@ private String delFlag; /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */ + @TableField(exist = false) private boolean flag = false; /** 鑿滃崟缁� */ + @TableField(exist = false) private Long[] menuIds; /** 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛� */ + @TableField(exist = false) private Long[] deptIds; /** 瑙掕壊鑿滃崟鏉冮檺 */ + @TableField(exist = false) private Set<String> permissions; public SysRole() -- Gitblit v1.9.3