Merge branch 'master' into feature/sysconfig

This commit is contained in:
胡少翔
2024-07-30 09:12:09 +08:00
21 changed files with 143 additions and 43 deletions

View File

@@ -96,4 +96,10 @@ public class GenFieldConfig extends BaseEntity {
private String tsType;
/**
* 字典类型
*/
private String dictType;
}

View File

@@ -1,8 +1,5 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -16,11 +13,6 @@ import lombok.Setter;
@Getter
@Setter
public class SysDept extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 部门名称

View File

@@ -1,7 +1,5 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.system.common.base.BaseEntity;
import lombok.Data;
@@ -13,11 +11,6 @@ import lombok.Data;
*/
@Data
public class SysDict extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 类型名称

View File

@@ -1,7 +1,5 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -15,11 +13,6 @@ import lombok.Setter;
@Getter
@Setter
public class SysRole extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 角色名称

View File

@@ -1,7 +1,5 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -12,11 +10,6 @@ import lombok.Setter;
@Getter
@Setter
public class SysUser extends BaseEntity {
/**
* 用户 ID
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 用户名