Merge branch 'sxy' into dev

internal/dao/bundleDao.go

@@ -158,7 +158,7 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 		query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
 	}
 
-	if err = query.Find(&bundles).Preload("BundleToValueAddService").Error; err != nil {
+	if err = query.Preload("BundleToValueAddService").Find(&bundles).Error; err != nil {
 		return res, commonErr.ReturnError(err, msg.ErrorGetBundleList, "获取套餐列表失败: ")
 	}
 	if bundles != nil && len(bundles) > 0 {