Merge branch 'feature/eta_2.6.9' into debug

models/report/report_free_layout.go

@@ -273,7 +273,7 @@ func ResetReportFreeLayoutsPage(items []*ReportFreeLayout) (err error) {
 	}
 	sql := `UPDATE report_free_layout SET page = ? WHERE id = ? LIMIT 1`
 	for _, v := range items {
-		if e := global.DbMap[utils.DbNameReport].Exec(sql, v.ReportId, v.Page).Error; e != nil {
+		if e := global.DbMap[utils.DbNameReport].Exec(sql, v.Page, v.Id).Error; e != nil {
 			return fmt.Errorf("ResetReportFreeLayoutsPage, %v", e)
 		}
 	}