合并master分支

services/task.go

@@ -38,7 +38,7 @@ func Task() {
 		task.AddTask("sendEmailFileForAskMsg", sendEmailFileForAskMsg)
 
 		sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
-		task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
+		task.AddTask("白名单发送", sendEmailUserWhiteListChange)
 	}
 
 	if utils.IsTask {
@@ -56,6 +56,7 @@ func Task() {
 		activityAttendanceDetail := task.NewTask("activityAttendanceDetail", "0 00 3 * * *", ActivityAttendanceDetail) //同步进门财经的路演信息
 		task.AddTask("sendEmailUserWhiteListChange", activityAttendanceDetail)
 	}
+
 	//ActivityAttendanceDetail()
 	//SynchronizationArthistory()//同步原有的阅读记录
 	//GetAddpArticle() //同步日度点评数据

services/user.go

@@ -877,6 +877,8 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	if len(listFrozen) > 0 {
 		sendResult2 = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
 	}
+	fmt.Println(sendResult2)
+	fmt.Println(sendResult)
 	os.Remove(downLoadnFilePaths)
 	//更新名单表
 	if sendResult {