Merge branch 'yb/3.5'

models/tables/edb_data/query.go

@@ -65,6 +65,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_coal"
 	case utils.DATA_SOURCE_PYTHON:
 		tableName = "edb_data_python"
+	case utils.DATA_SOURCE_GOOGLE_TRAVEL:
+		tableName = "edb_data_google_travel"
 	default:
 		tableName = ""
 	}

utils/constants.go

@@ -70,6 +70,8 @@ const (
 	DATA_SOURCE_COAL                            //中国煤炭网->26
 	DATA_SOURCE_PYTHON                          //python代码->27
 	DATA_SOURCE_PB_FINANCE                      //彭博财务数据->28
+	DATA_SOURCE_GOOGLE_TRAVEL                   //谷歌出行->29
+	DATA_SOURCE_PREDICT                         //普通预测指标->30
 )
 
 const (
@@ -167,7 +169,7 @@ const (
 
 // 报告
 const (
-	DEFAULT_REPORT_SHARE_BG_IMG = "https://hzstatic.hzinsights.com/static/icon/hzyb/rddp-share-bg.png"	// 分享默认背景图
+	DEFAULT_REPORT_SHARE_BG_IMG = "https://hzstatic.hzinsights.com/static/icon/hzyb/rddp-share-bg.png" // 分享默认背景图
 )
 
 // SystemSourceList 系统来源
@@ -185,4 +187,5 @@ var SystemSourceList = []int{
 	DATA_SOURCE_CALCULATE_ZJPJ,       //直接拼接->23
 	DATA_SOURCE_CALCULATE_LJZTBPJ,    //累计值同比拼接->24
 	DATA_SOURCE_PYTHON,               //python代码->27
-}
+	DATA_SOURCE_PREDICT,              //预测指标->30
+}