Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/manage_api_controller.go

@@ -2463,7 +2463,7 @@ func (this *MachineApiController) QueryInfo() {
 	endtime := this.GetString("endtime")
 	theTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
 	endtimes := theTimes.Unix()
-	fmt.Println("结束时间", endtimes)
+	fmt.Println("结束", endtimes)
 	limit, _ := this.GetInt64("limit")
 	fmt.Println("limit", limit)
 	page, _ := this.GetInt64("page")