tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并develop问题修复

Browse Source
This commit is contained in:
ray
2024-07-29 18:29:35 +08:00
parent 4ed3e280d7
commit 147d708994
7 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/youlai/system/model/entity/SysDept.java
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;
/**
* 部门名称

7
src/main/java/com/youlai/system/model/entity/SysDict.java
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;
/**
* 类型名称

7
src/main/java/com/youlai/system/model/entity/SysRole.java
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;
/**
* 角色名称

7
src/main/java/com/youlai/system/model/entity/SysUser.java
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;
/**
* 用户名