Merge remote-tracking branch 'origin/small_298'

controller/public.go

@@ -465,7 +465,7 @@ func BannerList(c *gin.Context) {
 	cond := " enable = 1 "
 
 	if isHomepage != 1 {
-		cond += " AND id <> 9999"
+		cond += " AND remark <> '调研合集' "
 	}
 
 	list, err := banner.GetBannerList(cond, page, limit)

models/tables/banner/query.go

@@ -4,7 +4,7 @@ import "hongze/hongze_yb/global"
 
 // GetBannerList
 func GetBannerList(cond string, page, limit int) (list []*Banner, err error) {
-	err = global.DEFAULT_MYSQL.Where(cond).Limit(limit).Offset((page - 1) * limit).Find(&list).Error
+	err = global.DEFAULT_MYSQL.Where(cond).Order("create_time desc").Limit(limit).Offset((page - 1) * limit).Find(&list).Error
 	return
 }