Merge branch 'master' into clients-patch

# Conflicts:
#	util/util.go
This commit is contained in:
kevin 2022-10-02 12:02:09 +08:00
commit 59a4ade8c6
14 changed files with 128 additions and 33 deletions

View file

@ -4,4 +4,6 @@ package model
type User struct {
Username string `json:"username"`
Password string `json:"password"`
// PasswordHash takes precedence over Password.
PasswordHash string `json:"password_hash"`
}