Merge remote-tracking branch 'origin/master'

internal/model/user.go

@@ -49,11 +49,6 @@ type UserUpdateIn struct {
 	Status   int
 }
 
-// UserOut 用户响应
-type UserOut struct {
-	*User
-}
-
 type LoginCache struct {
 	Token     string    `json:"token"`
 	Status    int       `json:"status" dc:"0-准备扫码，1-已扫码"`
@@ -77,3 +72,15 @@ type UserInfoOut struct {
 
 type UserBindPhoneIn struct {
 }
+
+type UserListIn struct {
+	OperatorId int64
+	Role       string
+	Nickname   string
+	Page       int
+	Size       int
+}
+type UserListOut struct {
+	List  []User
+	Total int
+}