From 0325a5a16afeb1c950f1097739a6385c464f5a0e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 14:37:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching

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