From 14b7b03cef787f6adb88936a5f5872f4e91efa7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Mon, 13 Oct 2025 23:49:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(base):=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除已注释的字段定义，包括 Name、Phone 和 Role 相关字段。
调整字段顺序并保留有效字段：Username、Password、PasswordV、HeadImg、Email、Status、Remark。
---
 modules/base/model/base_sys_user.go   | 7 +++----
 modules/base/service/base_sys_user.go | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/base/model/base_sys_user.go b/modules/base/model/base_sys_user.go
index 44132c2d..22ba6143 100644
--- a/modules/base/model/base_sys_user.go
+++ b/modules/base/model/base_sys_user.go
@@ -8,18 +8,17 @@ const TableNameBaseSysUser = "base_sys_user"
 type BaseSysUser struct {
 	*cool.Model
 	DepartmentID uint `gorm:"column:departmentId;type:bigint;index" json:"departmentId"` // 部门ID
-	//Name         *string `gorm:"column:name;type:varchar(255)" json:"name"`                        // 姓名
+
 	Username  string `gorm:"column:username;type:varchar(100);not null;Index" json:"username"` // 用户名
 	Password  string `gorm:"column:password;type:varchar(255);not null" json:"password"`       // 密码
 	PasswordV *int32 `gorm:"column:passwordV;type:int;not null;default:1" json:"passwordV"`    // 密码版本, 作用是改完密码，让原来的token失效
 
 	HeadImg *string `gorm:"column:headImg;type:varchar(255)" json:"headImg"` // 头像
-	//Phone        *string `gorm:"column:phone;type:varchar(20);index" json:"phone"`                 // 手机
+
 	Email  *string `gorm:"column:email;type:varchar(255)" json:"email"`    // 邮箱
 	Status *int32  `gorm:"column:status;not null;default:1" json:"status"` // 状态 0:禁用 1：启用
 	Remark *string `gorm:"column:remark;type:varchar(255)" json:"remark"`  // 备注
-	//Role   bool    `gorm:"column:isNew;type:bool;not null;default:0" json:"isNew"` //
-	//SocketID     *string `gorm:"column:socketId;type:varchar(255)" json:"socketId"`                // socketId
+
 }
 
 // TableName BaseSysUser's table name
diff --git a/modules/base/service/base_sys_user.go b/modules/base/service/base_sys_user.go
index 578b92ab..0f3e2f1b 100644
--- a/modules/base/service/base_sys_user.go
+++ b/modules/base/service/base_sys_user.go
@@ -238,8 +238,8 @@ func NewBaseSysUserService() *BaseSysUserService {
 			Model:              model.NewBaseSysUser(),
 			InfoIgnoreProperty: "password",
 			UniqueKey: map[string]string{
-				//	"username": "用户名不能重复",
-				"email": "邮箱不能重复",
+				"username": "用户名不能重复",
+				"email":    "邮箱不能重复",
 			},
 			PageQueryOp: &cool.QueryOp{
 				Select: `