This commit is contained in:
2023-06-15 16:17:13 +08:00
parent a7ee9eadba
commit 076955a04f
20 changed files with 941 additions and 73 deletions

View File

@ -25,9 +25,6 @@ public class SysDictData extends BaseEntity {
@TableId
private String dictCode;
@Excel(name = "字典排序", width = 20)
private Long dictSort;
@Excel(name = "字典标签", width = 20)
private String dictLabel;
@ -41,10 +38,10 @@ public class SysDictData extends BaseEntity {
private String listClass;
@Excel(name = "是否默认", width = 20, replace = {"是_Y", "否_N"})
private String isDefault;
@Excel(name = "状态", width = 20, replace = {"正常_1", "停用_0"})
private String status;
@Excel(name = "字典排序", width = 20)
private Long dictSort;
}

View File

@ -22,16 +22,16 @@ public class SysRole extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId
@Excel(name = "岗位序号", width = 20)
@Excel(name = "角色序号", width = 20)
private String roleId;
@Excel(name = "岗位序号", width = 20)
@Excel(name = "角色名称", width = 20)
private String roleName;
@Excel(name = "岗位序号", width = 20)
@Excel(name = "权限字符", width = 20)
private String roleKey;
@Excel(name = "岗位序号", width = 20)
@Excel(name = "角色序号", width = 20)
private Integer roleSort;
@Excel(name = "数据范围", width = 20, replace = {"所有数据权限_1", "自定义数据权限_2", "本部门数据权限_3", "本部门及以下数据权限_4", "仅本人数据权限_5"})

View File

@ -3,8 +3,10 @@ package com.qiaoba.api.system.entity.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* 角色查询参数
@ -28,9 +30,9 @@ public class SysRoleParam implements Serializable {
@Schema(description = "状态(0->禁用,1->正常)")
private String status;
@Schema(description = "开始时间")
private String beginTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
@Schema(description = "结束时间")
private String endTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}

View File

@ -3,6 +3,9 @@ package com.qiaoba.api.system.entity.param;
import com.qiaoba.common.base.entity.DataScopeParam;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 用户查询参数
@ -27,8 +30,10 @@ public class SysUserParam extends DataScopeParam {
private String status;
private String beginTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
private String endTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}