Merge remote-tracking branch 'origin/main'

piexlmax · piexlmax · commit 3cbad5978140 · 2022-03-31T22:15:09.000+08:00
diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go
@@ -18,6 +18,6 @@ type SysUser struct {
 	AuthorityId string         `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
 	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
 	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
-	Phone       string         `json:"phone"  gorm:"comment:用户手机号"` // 用户角色ID
+	Phone       string         `json:"phone"  gorm:"comment:用户手机号"` // 用户手机号
 	Email       string         `json:"email"  gorm:"comment:用户邮箱"`  // 用户邮箱
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ type SysUser struct {`
`18`	`18`	AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID
`19`	`19`	Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
`20`	`20`	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
`21`		- Phone string `json:"phone" gorm:"comment:用户手机号"` // 用户角色ID
	`21`	+ Phone string `json:"phone" gorm:"comment:用户手机号"` // 用户手机号
`22`	`22`	Email string `json:"email" gorm:"comment:用户邮箱"` // 用户邮箱
`23`	`23`	`}`