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:
海言
2026-05-28 15:54:43 +08:00
24 changed files with 246 additions and 494 deletions

View File

@@ -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;