Merge remote-tracking branch 'origin/master'

internal/logic/user/user.go

@@ -124,3 +124,7 @@ func (s *sUser) Update(ctx context.Context, in *model.UserUpdateIn) (out *model.
 func (s *sUser) BindPhone(ctx context.Context, in *model.UserBindPhoneIn) (out *model.UpdateOut, err error) {
 	return
 }
+
+func (s *sUser) List(ctx context.Context, in *model.UserListIn) (out *model.UserListOut, err error) {
+	return
+}

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
+}