Merge branch 'refs/heads/eta_2.0.8_ly_0804@guomengyuan' into debug

# Conflicts:
#	routers/commentsRouter.go

controllers/base_from_ly.go

@@ -18,8 +18,7 @@ type BaseFromLyController struct {
 // Add
 // @Title 新增粮油商务网指标
 // @Description 新增粮油商务网指标
-// @Param
-// @SUCCESS 200 {object} models.BaseFromLyIndex
+// @Success 200 true
 // @Router /add [post]
 func (this *BaseFromLyController) Add() {
 	br := new(models.BaseResponse).Init()

models/base_from_ly.go

@@ -27,7 +27,7 @@ func init() {
 // GetBaseFromLyDataByIndexCode 根据指标编码查询
 func GetBaseFromLyDataByIndexCode(condition string, pars []interface{}) (items []BaseFromLyData, err error) {
 	sql := `SELECT * FROM base_from_ly_data WHERE 1=1 `
-	o := orm.NewOrmUsingDB("data")
+	o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -56,7 +56,7 @@ func AddEdbDataFromLy(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	if dataLen > 0 {
 		var isAdd bool
-		addSql := ` INSERT INTO ebd_data_ly (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_ly (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		for i := 0; i < dataLen; i++ {
 			item := dataAll[i]
 			eDate := item.DataTime