mirror of
https://github.com/RemainderTime/spring-boot-base-demo.git
synced 2026-06-09 11:39:58 +08:00
Merge branch 'master' into feature/admin-auth-satoken
# Conflicts: # src/main/java/cn/xf/basedemo/interceptor/TokenInterceptor.java # src/main/java/cn/xf/basedemo/service/impl/UserServiceImpl.java
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package cn.xf.basedemo.model.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
@@ -17,6 +19,7 @@ import java.util.Date;
|
||||
@TableName(value = "xf_user")
|
||||
public class User {
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
private String name;
|
||||
|
||||
Reference in New Issue
Block a user