文章列表页的开发

service/member_service/models.go

@@ -34,23 +34,6 @@ type CustomerIllness struct {
 func (CustomerIllness) TableName() string {
 	return "sgj_user_customer_illness"
 }
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
 
 type Tags struct {
 	models.UserTags
@@ -66,4 +49,4 @@ type TagsMemberCount struct {
 	MemberCount int64 `gorm:"member_count"`
 	TagID       int64 `gorm:"tag_id"`
 }
->>>>>>> .theirs
+