Merge branch 'dev'

Author: Jason

app/app/user/service/dto/user.go

@@ -11,7 +11,6 @@ type UserQueryReq struct {
 	dto.Pagination    `search:"-"`
 	BeginCreatedAt    string   `form:"beginCreatedAt" search:"type:gte;column:created_at;table:app_user" comment:"创建时间"`
 	EndCreatedAt      string   `form:"endCreatedAt" search:"type:lte;column:created_at;table:app_user" comment:"创建时间"`
-	Id                int64    `form:"id"  search:"type:exact;column:id;table:app_user" comment:"用户编号"`
 	LevelId           int64    `form:"levelId"  search:"type:exact;column:level_id;table:app_user" comment:"用户等级编号"`
 	LevelIds          []int64  `form:"levelId"  search:"type:exact;column:level_id;table:app_user" comment:"用户等级编号"`
 	UserName          string   `form:"userName"  search:"type:exact;column:user_name;table:app_user" comment:"用户昵称"`

app/app/user/service/dto/user_account_log.go

@@ -9,7 +9,6 @@ import (
 
 type UserAccountLogQueryReq struct {
 	dto.Pagination   `search:"-"`
-	UserId           int64  `form:"userId"  search:"type:exact;column:user_id;table:app_user_account_log" comment:"用户编号"`
 	MoneyType        string `form:"moneyType"  search:"type:exact;column:money_type;table:app_user_account_log" comment:"金额类型 1:余额 "`
 	ChangeType       string `form:"changeType"  search:"type:exact;column:change_type;table:app_user_account_log" comment:"帐变类型(1-类型1)"`
 	BeginCreatedAt   string `form:"beginCreatedAt" search:"type:gte;column:created_at;table:app_user_account_log" comment:"创建时间"`

app/app/user/service/dto/user_conf.go

@@ -8,7 +8,6 @@ import (
 
 type UserConfQueryReq struct {
 	dto.Pagination   `search:"-"`
-	UserId           int64  `form:"userId"  search:"type:exact;column:user_id;table:app_user_conf" comment:"用户编号"`
 	CanLogin         string `form:"canLogin"  search:"type:exact;column:can_login;table:app_user_conf" comment:"1-允许登陆；2-不允许登陆"`
 	BeginCreatedAt   string `form:"beginCreatedAt" search:"type:gte;column:created_at;table:app_user_conf" comment:"创建时间"`
 	EndCreatedAt     string `form:"endCreatedAt" search:"type:lte;column:created_at;table:app_user_conf" comment:"创建时间"`

app/app/user/service/dto/user_oper_log.go

@@ -10,7 +10,6 @@ type UserOperLogQueryReq struct {
 	dto.Pagination   `search:"-"`
 	ActionType       string `form:"actionType"  search:"type:exact;column:action_type;table:app_user_oper_log" comment:"用户行为类型"`
 	ByType           string `form:"byType"  search:"type:exact;column:by_type;table:app_user_oper_log" comment:"更新用户类型 1-app用户 2-后台用户"`
-	UserId           int64  `form:"userId"  search:"type:exact;column:user_id;table:app_user_oper_log" comment:"用户编号"`
 	BeginCreatedAt   string `form:"beginCreatedAt" search:"type:gte;column:created_at;table:app_user_oper_log" comment:"创建时间"`
 	EndCreatedAt     string `form:"endCreatedAt" search:"type:lte;column:created_at;table:app_user_oper_log" comment:"创建时间"`
 	ShowInfo         bool   `form:"-"  search:"-" comment:"是否明文显示加密信息"`

app/app/user/service/user.go

@@ -59,7 +59,7 @@ func (e *User) GetPage(c *dto.UserQueryReq, p *middleware.DataPermission) ([]mod
 		if err != nil {
 			return nil, 0, respCode, err
 		}
-		c.ParentId = m.ParentId
+		c.ParentId = m.Id
 	}
 
 	err := e.Orm.Preload("UserLevel").Order("created_at desc").Model(&data).

go.mod

@@ -22,10 +22,10 @@ require (
 	github.com/openzipkin/zipkin-go v0.4.3
 	github.com/prometheus/client_golang v1.23.0
 	github.com/redis/go-redis/v9 v9.12.1
-	github.com/shirou/gopsutil/v4 v4.25.7
+	github.com/shirou/gopsutil/v4 v4.25.8
 	github.com/shopspring/decimal v1.4.0
 	github.com/spf13/cast v1.9.2
-	github.com/spf13/cobra v1.9.1
+	github.com/spf13/cobra v1.10.1
 	github.com/stretchr/testify v1.11.1
 	github.com/xuri/excelize/v2 v2.9.1
 	golang.org/x/crypto v0.41.0
@@ -83,15 +83,15 @@ require (
 	github.com/nyaruka/phonenumbers v1.0.55 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.65.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/tiendc/go-deepcopy v1.6.1 // indirect
 	github.com/tklauser/go-sysconf v0.3.15 // indirect
 	github.com/tklauser/numcpus v0.10.0 // indirect