From 02ac6301a5aead5691fbb45f839e81a084af9b94 Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Thu, 13 Jun 2024 19:23:01 +0800
Subject: [PATCH] fx

---
 dbstruct/zonemoment.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dbstruct/zonemoment.go b/dbstruct/zonemoment.go
index 0cddab4d..0ee8363b 100644
--- a/dbstruct/zonemoment.go
+++ b/dbstruct/zonemoment.go
@@ -120,7 +120,6 @@ func (p *ZoneMoment) GetPaidText() string {
 	return ""
 }
 
-<<<<<<< HEAD
 type ZoneMomentStatInfo struct {
 	Mid   *int64 `json:"id" bson:"_id"`      // mid
 	Count *int64 `json:"count" bson:"count"` // count