data_manage数据库兼容

models/data_manage/base_from_clarksons_data.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromClarksonsData struct {
-	BaseFromClarksonsDataId  int       `orm:"column(base_from_clarksons_data_id);pk"`
+	BaseFromClarksonsDataId  int       `gorm:"column:base_from_clarksons_data_id;primaryKey"`
 	BaseFromClarksonsIndexId int       `description:"指标id"`
 	IndexCode                string    `description:"指标编码"`
 	DataTime                 string    `description:"数据日期"`

models/data_manage/base_from_rzd_data.go

@@ -76,13 +76,13 @@ func GetBaseFormRzdDataByConditionCount(condition string, pars interface{}) (cou
 	return
 }
 
-func GetBaseFormRzdDataByCondition(condition string, pars interface{}) (items []*BaseFromRzdData, err error) {
+func GetBaseFormRzdDataByCondition(condition string, pars []interface{}) (items []*BaseFromRzdData, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_rzd_data WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Find(&items).Error
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/system/sys_menu.go

@@ -61,7 +61,7 @@ type MenuList struct {
 	LevelPath string       `json:"level_path"`
 	Component string       `json:"component"`
 	Hidden    bool         `json:"hidden"`
-	Children  []*ChildMenu `json:"children"`
+	Children  []*ChildMenu `json:"children" gorm:"-"`
 }
 
 type ChildMenu struct {