From 14e060206ec8445daf6f72081d7aaf7b4fc85cf5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java
index d419e2c..351ef3c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,7 +27,7 @@
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "用户id")
--
Gitblit v1.7.1