Merge branch 'ETA_2.2.2' into debug

# Conflicts:
#	models/data_manage/edb_data_base.go
#	models/data_manage/edb_info.go
#	services/data/edb_info.go

models/bi_dashboard/bi_dashboard_detail.go

@@ -29,7 +29,7 @@ func (m *BiDashboardDetail) TableName() string {
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
 	//err = global.DEFAULT_DmSQL.Table("bi_dashboard_detail").Where("bi_dashboard_id IN ?", id).Find(&list).Error
 	o := orm.NewOrm()
-	_, err = o.Raw("SELECT * FROM bi_dashboard_detail where bi_dashboard_id IN ?", id).QueryRows(&list)
+	_, err = o.Raw("SELECT * FROM bi_dashboard_detail where bi_dashboard_id = ?", id).QueryRows(&list)
 	return
 }
 

services/data/edb_info.go

@@ -2994,6 +2994,7 @@ func GetIsSupplierStop(source int, edbCode string) (isSupplierStop int) {
 
 	return
 }
+
 func EditBaseEdbInfo(req data_manage.EditEdbInfoReq, sysUser *system.Admin, lang, requestBody, uri string) (isSendEmail bool, err error, errMsg string) {
 	isSendEmail = true
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)