Merge branch 'fix/calculate_formula'

# Conflicts:
#	utils/constants.go

models/edb_data_table.go

@@ -57,8 +57,12 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_ljztbpj"
 	case utils.DATA_SOURCE_LT:
 		tableName = "edb_data_lt"
+	case utils.DATA_SOURCE_COAL:
+		tableName = "edb_data_coal"
+	case utils.DATA_SOURCE_PYTHON:
+		tableName = "edb_data_python"
 	default:
 		tableName = ""
 	}
 	return
-}
+}

utils/constants.go

@@ -53,7 +53,8 @@ const (
 	DATA_SOURCE_CALCULATE_ZJPJ                  //直接拼接->23
 	DATA_SOURCE_CALCULATE_LJZTBPJ               //累计值同比拼接->24
 	DATA_SOURCE_LT                              //路透->25
-	DATA_SOURCE_COAL                              //中国煤炭网->26
+	DATA_SOURCE_COAL                            //煤炭网->26
+	DATA_SOURCE_PYTHON                          //python代码->27
 )
 
 //基础数据初始化日期