Merge branch 'feature/eta1.2.2_edb_source' into debug

# Conflicts:
#	routers/router.go

services/edb_terminal.go

@@ -11,7 +11,7 @@ func GetTerminal(source int, oldTerminalCode string) (edbTerminal *models.EdbTer
 	if source == utils.DATA_SOURCE_WIND {
 		// todo 确认wind_data_url字段存的是TerminalCode终端编码
 		tmpConfig := new(models.EdbConfig)
-		tmpConfig, err = models.GetConfigDetailByCode("wind_data_url")
+		tmpConfig, err = models.GetConfigDetailByCode("wind_terminal_code")
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			err = errors.New("获取配置的wind地址失败，err:" + err.Error())
 			return