From 9bc0a948874e8a6ebee076861647191c9ff1b80e Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Wed, 15 Mar 2023 19:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cv/group_power_cv/groupPower.go    | 4 ++--
 route/group_power_r/group_power.go | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cv/group_power_cv/groupPower.go b/cv/group_power_cv/groupPower.go
index 9a5d355..0417e4e 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 b52a2b2..d861807 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 {
-- 
2.22.0