fx

2024-06-13 19:23:01 +08:00 · 2024-06-13 19:23:01 +08:00 · 02ac6301a5
parent a13966ede9
commit 02ac6301a5
1 changed files with 0 additions and 1 deletions
--- 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