Browse Source

feat(user): add remark field to User model and form (#307)

lejianwen 6 months ago
parent
commit
ff2c79a316
2 changed files with 4 additions and 0 deletions
  1. 3 0
      http/request/admin/user.go
  2. 1 0
      model/user.go

+ 3 - 0
http/request/admin/user.go

@@ -14,6 +14,7 @@ type UserForm struct {
14 14
 	GroupId  uint             `json:"group_id" validate:"required"`
15 15
 	IsAdmin  *bool            `json:"is_admin" `
16 16
 	Status   model.StatusCode `json:"status" validate:"required,gte=0"`
17
+	Remark   string           `json:"remark"`
17 18
 }
18 19
 
19 20
 func (uf *UserForm) FromUser(user *model.User) *UserForm {
@@ -25,6 +26,7 @@ func (uf *UserForm) FromUser(user *model.User) *UserForm {
25 26
 	uf.GroupId = user.GroupId
26 27
 	uf.IsAdmin = user.IsAdmin
27 28
 	uf.Status = user.Status
29
+	uf.Remark = user.Remark
28 30
 	return uf
29 31
 }
30 32
 func (uf *UserForm) ToUser() *model.User {
@@ -37,6 +39,7 @@ func (uf *UserForm) ToUser() *model.User {
37 39
 	user.GroupId = uf.GroupId
38 40
 	user.IsAdmin = uf.IsAdmin
39 41
 	user.Status = uf.Status
42
+	user.Remark = uf.Remark
40 43
 	return user
41 44
 }
42 45
 

+ 1 - 0
model/user.go

@@ -11,6 +11,7 @@ type User struct {
11 11
 	GroupId  uint       `json:"group_id" gorm:"default:0;not null;index"`
12 12
 	IsAdmin  *bool      `json:"is_admin" gorm:"default:0;not null;"`
13 13
 	Status   StatusCode `json:"status" gorm:"default:1;not null;"`
14
+	Remark   string     `json:"remark" gorm:"default:'';not null;"`
14 15
 	TimeModel
15 16
 }
16 17