diff --git a/cv/group_power_cv/groupPower.go b/cv/group_power_cv/groupPower.go index 9a5d355691846fcbe458fa1fc1aeefe48a32f500..0417e4eddf063728e3523c5b4ba94f9043b5cb92 100644 --- a/cv/group_power_cv/groupPower.go +++ b/cv/group_power_cv/groupPower.go @@ -690,14 +690,14 @@ type FamilyMemberDetail struct { type FamilyApplyList struct { User *user_m.UserTiny `json:"user"` - Time string `json:"time"` + Time int64 `json:"time"` Status int8 `json:"status"` // 0未操作,1已接受,2.已拒绝 MgrName string `json:"mgrName"` // 管理员名称 } type FamilyQuitList struct { User *user_m.UserTiny `json:"user"` - Time string `json:"time"` + Time int64 `json:"time"` QuitType int8 `json:"status"` // 1.主动退出 2.被踢出 MgrName string `json:"mgrName"` // 管理员名称 } diff --git a/route/group_power_r/group_power.go b/route/group_power_r/group_power.go index b52a2b2f1079a554ee4c14b3fdb0457236a2c379..d861807584336ebcb050a40e3c7ec7f738c594bb 100644 --- a/route/group_power_r/group_power.go +++ b/route/group_power_r/group_power.go @@ -14,7 +14,6 @@ import ( "hilo-group/_const/enum/msg_e" "hilo-group/_const/redis_key" "hilo-group/common" - "hilo-group/common/utime" "hilo-group/cv/group_cv" "hilo-group/cv/group_power_cv" "hilo-group/cv/medal_cv" @@ -1095,7 +1094,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) { result := make([]*group_power_cv.FamilyApplyList, 0, len(rows)) for _, v := range rows { - info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute), Status: v.IsAccept} + info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime.UnixMilli(), Status: v.IsAccept} if v.MgrId > 0 { info.MgrName = userMap[v.MgrId].Nick } @@ -1245,7 +1244,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) { result := make([]*group_power_cv.FamilyQuitList, 0, len(rows)) for _, v := range rows { - item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute)} + item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime.UnixMilli()} if v.UserId == v.MgrId { item.QuitType = 1 // 主动退出 } else {