Merge branch 'fix/2023-12-5' into debug

# Conflicts:
#	controllers/base_from_wind.go

controllers/base_from_wind.go

@@ -54,6 +54,7 @@ func (this *WindController) Add() {
 
 		windUrl := ``
 		terminalCode := ""
+
 		// 试用平台的话，需要额外从弘则这边获取下地址
 		if utils.BusinessCode == utils.HZ_TRIAL_BUSSINESS_CODE {
 			// todo 从体验版中获取对应的终端信息

models/edb_info.go

@@ -334,7 +334,7 @@ func GetEdbInfoOnlyByEdbCode(edbCode string) (item *EdbInfo, err error) {
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
 	o := orm.NewOrm()
 
-	sql := ` SELECT a.*,b.sub_source AS from_sub_source FROM edb_info_calculate_mapping AS a LEFT JOIN edb_info AS b ON a.from_edb_info_id = b.edb_info_id WHERE 1=1 `
+	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}