Merge branch 'dev/1.5' into debug

controllers/data_manage/my_chart.go

@@ -1869,7 +1869,6 @@ func (this *MyChartController) Locate() {
 				return
 			}
 			condition += fmt.Sprintf(` AND chart_classify_id IN (%s)`, strIds)
-			orderRule = `chart_classify_id`
 		}
 	}