Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

services/bi_approve/bi_approve.go

@@ -14,7 +14,7 @@ import (
 )
 
 var (
-	timeField   = map[int]string{1: fmt.Sprintf("a.%s", biapprove.BiApproveCols.CreateTime), 2: fmt.Sprintf("a.%s", biapprove.BiApproveCols.ApproveTime), 3: fmt.Sprintf("b.%s", biapprove.BiApproveCols.ApproveTime)}
+	timeField   = map[int]string{1: fmt.Sprintf("a.%s", biapprove.BiApproveRecordCols.CreateTime), 2: fmt.Sprintf("a.%s", biapprove.BiApproveRecordCols.NodeApproveTime), 3: fmt.Sprintf("b.%s", biapprove.BiApproveCols.ApproveTime)}
 	myTimeField = map[int]string{1: biapprove.BiApproveCols.CreateTime, 3: biapprove.BiApproveCols.ApproveTime}
 	orderRules  = map[int]string{1: "ASC", 2: "DESC"}
 )