From 5d555698ab66b6f21f8d89a8c475007945357c6f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 4 Aug 2023 20:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E9=97=A8=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/model_caravan.go | 3 +--
 modules/caravan/module.go        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go
index cf54d91df..710684984 100644
--- a/modules/caravan/model_caravan.go
+++ b/modules/caravan/model_caravan.go
@@ -8,7 +8,6 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
-	"go_dreamfactory/utils"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -49,7 +48,7 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
 		result.Id = primitive.NewObjectID().Hex()
 		// 活动持续时间
 
-		result.Resettime = utils.WeekIntervalTime()
+		//result.Resettime = utils.WeekIntervalTime()
 		result.Citystime = configure.Now().Unix()
 		result.Rtime = configure.Now().Unix()
 
diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index 7fcb90e91..04480e465 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -122,7 +122,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
 		city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重
 		data.City[v.Id] = city
 	}
-	//data.Citystime = utils.GetZeroTime(configure.Now().Unix())
+	data.Citystime = utils.GetZeroTime(configure.Now().Unix())
 	data.Rtime = configure.Now().Unix() // 修改时间
 }