Merge branch 'eta/2.1.0' into debug

models/business_conf/business_conf.go

@@ -47,7 +47,7 @@ func (c *BusinessConf) GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	err = global.MYSQL["master"].Model(c).Order("create_time DESC").Scan(&list).Error
+	err = global.MYSQL["master"].Model(c).Order("create_time DESC").Scan(&items).Error
 	if err != nil {
 		return
 	}