Merge branch 'gn_2.6_add_ppt_cover_1121@guomengyuan' into debug

controllers/image_conf_controller.go

@@ -60,7 +60,7 @@ func (this *ImageConfController) GetImageMaterial() {
 	var condition string
 	var pars []interface{}
 
-	condition += ` AND conf_type=? `
+	condition += ` conf_type=? `
 	pars = append(pars, confType)
 
 	if imageType > 0 {
@@ -75,7 +75,7 @@ func (this *ImageConfController) GetImageMaterial() {
 	condition += ` ORDER BY modify_time DESC `
 
 	condition += ` LIMIT ?, ? `
-	pars = append(pars, pageSize, startSize)
+	pars = append(pars, startSize, pageSize)
 
 	imageConfList, err := models.GetImageConfByCondition(condition, pars)