no message

models/business_conf.go

@@ -20,7 +20,7 @@ const (
 
 // BusinessConf 商户配置表
 type BusinessConf struct {
-	Id         int    `orm:"column(id);pk"`
+	Id         int    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ConfKey    string `description:"配置Key"`
 	ConfVal    string `description:"配置值"`
 	ValType    int    `description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`

models/classify.go

@@ -7,7 +7,7 @@ import (
 )
 
 type Classify struct {
-	Id             int       `orm:"column(id);pk"`
+	Id             int       `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ClassifyName   string    `description:"分类名称"`
 	Sort           int       `json:"-"`
 	ParentId       int       `description:"父级分类id"`
@@ -131,7 +131,7 @@ func GetClassifyById(classifyId int) (item *Classify, err error) {
 //}
 
 type ClassifyList struct {
-	Id            int         `orm:"column(id);pk"`
+	Id            int         `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ClassifyName  string      `description:"分类名称"`
 	Sort          int         `json:"-"`
 	ParentId      int         `description:"父级分类id"`

models/data_manage/base_from_changes_visitors_covid.go

@@ -7,11 +7,11 @@ import (
 
 // 谷歌出行指数
 type BaseFromChangesVisitorsCovid struct {
-	Id                  uint64    `orm:"column(id);pk"`    //序号
-	Entity              string    `orm:"column(entity)"`   //国家
-	Code                string    `orm:"column(code)"`     //国家编码
-	EdbCode             string    `orm:"column(edb_code)"` //指标ID
-	Day                 time.Time `orm:"column(day)"`      //统计的日期
+	Id                  uint64    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`    //序号
+	Entity              string    `orm:"column(entity)"`        //国家
+	Code                string    `orm:"column(code)"`          //国家编码
+	EdbCode             string    `orm:"column(edb_code)"`      //指标ID
+	Day                 time.Time `orm:"column(day)"`           //统计的日期
 	RetailAndRecreation string    `orm:"column(retail_and_recreation)"`
 	GroceryAndPharmacy  string    `orm:"column(grocery_and_pharmacy)"`
 	Residential         string    `orm:"column(residential)"`

models/data_manage/base_from_eia_steo.go

@@ -9,7 +9,7 @@ import (
 
 // BaseFromEiaSteoIndex EiaSteo指标
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int    `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int    `gorm:"column:base_from_eia_steo_index_id;primaryKey"` // `orm:"column(base_from_eia_steo_index_id);pk"`
 	BaseFromEiaSteoClassifyId int    `description:"指标分类id"`
 	IndexCode                 string `description:"指标编码"`
 	IndexName                 string `description:"指标名称（中文名称）"`
@@ -90,7 +90,7 @@ func (item *BaseFromEiaSteoIndex) Update(cols []string) (err error) {
 
 // BaseFromEiaSteoClassify EiaSteo分类
 type BaseFromEiaSteoClassify struct {
-	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk"`
+	BaseFromEiaSteoClassifyId int       `gorm:"column:base_from_eia_steo_classify_id;primaryKey"` // `orm:"column(base_from_eia_steo_classify_id);pk"`
 	ClassifyName              string    `description:"分类名称（中文名称）"`
 	ClassifyNameOriginal      string    `description:"分类名称（原始名称）"`
 	ParentId                  int       `description:"父级id"`
@@ -114,7 +114,7 @@ func (item *BaseFromEiaSteoClassify) AddBaseFromEiaSteoClassify() (err error) {
 
 // BaseFromEiaSteoData EiaSteo数据表
 type BaseFromEiaSteoData struct {
-	BaseFromEiaSteoDataId  int       `orm:"column(base_from_eia_steo_data_id);pk"`
+	BaseFromEiaSteoDataId  int       `gorm:"column:base_from_eia_steo_data_id;primaryKey"` // `orm:"column(base_from_eia_steo_data_id);pk"`
 	BaseFromEiaSteoIndexId int       `description:"指标id"`
 	IndexCode              string    `description:"指标编码"`
 	DataTime               time.Time `description:"数据日期"`

models/data_manage/base_from_gie.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey"` //`orm:"column(base_from_eic_index_id);pk"`
 	Type                   string
 	EicCode                string
 	Name                   string

models/data_manage/base_from_icpi.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
+	BaseFromIcpiIndexId    int       `gorm:"column:base_from_icpi_index_id;primaryKey"` //`orm:"column(base_from_icpi_index_id);pk"`
 	BaseFromIcpiClassifyId int       `description:"分类id"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -66,7 +66,7 @@ func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpi
 }
 
 type BaseFromIcpiClassify struct {
-	BaseFromIcpiClassifyId int    `orm:"column(base_from_icpi_classify_id);pk"`
+	BaseFromIcpiClassifyId int    `gorm:"column:base_from_icpi_classify_id;primaryKey"` //`orm:"column(base_from_icpi_classify_id);pk"`
 	ClassifyName           string `description:"分类名称"`
 	ClassifyNameEn         string `description:"英文名称"`
 	ParentId               int    `description:"上级id"`
@@ -124,7 +124,7 @@ func GetBaseFromIcpiMaxDate() (max_date time.Time, err error) {
 }
 
 type BaseFromIcpiData struct {
-	BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
+	BaseFromIcpiDataId  int       `gorm:"column:base_from_icpi_data_id;primaryKey"` //`orm:"column(base_from_icpi_data_id);pk"`
 	BaseFromIcpiIndexId int       `description:"指标id"`
 	IndexCode           string    `description:"指标编码"`
 	DataTime            string    `description:"日期"`

models/data_manage/base_from_smm.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromSmm struct {
-	BaseFromSmmId int `orm:"column(base_from_smm_id);pk"`
+	BaseFromSmmId int `gorm:"column:base_from_smm_id;primaryKey"` //`orm:"column(base_from_smm_id);pk"`
 	Aid           int
 	Name          string
 	Interface     string
@@ -56,7 +56,7 @@ func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
 }
 
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int `gorm:"column:base_from_smm_index_id;primaryKey"` //`orm:"column(base_from_smm_index_id);pk"`
 	Interface          string
 	Name               string
 	IndexCode          string
@@ -94,7 +94,7 @@ func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
 }
 
 type BaseFromSmmData struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"` //`orm:"column(smm_data_id);pk"`
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string
@@ -180,7 +180,7 @@ func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, m
 }
 
 type BaseFromSmmDataSimple struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"` //`orm:"column(smm_data_id);pk"`
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string

models/data_manage/base_from_ths_hf_index.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk"`
+	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey"` // `orm:"column(base_from_ths_hf_index_id);pk"`
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`

models/data_manage/base_from_trade_cffex.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeCffexIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
 	Rank                      int
 	DealShortName             string
 	DealName                  string

models/data_manage/base_from_trade_dalian.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int    `orm:"column(base_from_trade_dalian_index_id);pk"`
+	BaseFromTradeDalianIndexId int    `gorm:"column:base_from_trade_dalian_index_id;primaryKey"` // `orm:"column(base_from_trade_dalian_index_id);pk"`
 	Rank                       string `description:"排名"`
 	DealShortName              string `description:"成交量公司简称"`
 	DealName                   string `description:"成交量指标名称"`
@@ -44,7 +44,7 @@ func AddBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex) (lastId int64,
 }
 
 type BaseFromTradeDalianData struct {
-	BaseFromTradeDalianDataId  int `orm:"column(base_from_trade_dalian_data_id);pk"`
+	BaseFromTradeDalianDataId  int `gorm:"column:base_from_trade_dalian_data_id;primaryKey"` //`orm:"column(base_from_trade_dalian_data_id);pk"`
 	BaseFromTradeDalianIndexId int
 	IndexCode                  string
 	DataTime                   time.Time

models/data_manage/base_from_trade_guangzhou.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey"` //  `orm:"column(base_from_trade_guangzhou_index_id);pk"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	BaseFromTradeGuangzhouContractId int       `description:"合约id"`
 	IndexCode                        string    `description:"指标编码"`
@@ -51,7 +51,7 @@ type GuangzhouIndexResp struct {
 }
 
 type BaseFromTradeGuangzhouClassify struct {
-	BaseFromTradeGuangzhouClassifyId int       `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
+	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
 	ClassifyName                     string    `description:"分类名称"`
 	ClassifyCode                     string    `description:"分类编码"`
 	ParentId                         int       `description:"分类父级id"`
@@ -88,7 +88,7 @@ func AddBaseFromTradeGuangzhouClassify(item *BaseFromTradeGuangzhouClassify) (la
 }
 
 type BaseFromTradeGuangzhouContract struct {
-	BaseFromTradeGuangzhouContractId int    `orm:"column(base_from_trade_guangzhou_contract_id);pk"`
+	BaseFromTradeGuangzhouContractId int    `gorm:"column:base_from_trade_guangzhou_contract_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_contract_id);pk"`
 	BaseFromTradeGuangzhouClassifyId int    `description:"分类id"`
 	ClassifyCode                     string `description:"分类编码"`
 	Contract                         string `description:"合约编码"`
@@ -129,7 +129,7 @@ func GetBaseFromTradeGuangzhouMaxDate() (max_date time.Time, err error) {
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey"` // `orm:"column(base_from_trade_guangzhou_data_id);pk"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      string    `description:"数据日期"`

models/data_manage/base_from_trade_ine.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeIneIndex struct {
-	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeIneIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` //`orm:"column(base_from_trade_ine_index_id);pk"`
 	Rank                    int
 	DealShortName           string
 	DealName                string

models/data_manage/base_from_trade_shanghai.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShangHaiIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
 	Rank                         int
 	DealShortName                string
 	DealName                     string

models/data_manage/base_from_trade_zhengzhou.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	BaseFromTradeZhengzhouIndexId int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"` //`orm:"column(base_from_trade_zhengzhou_index_id);pk"`
 	Rank                          int
 	DealShortName                 string
 	DealName                      string

models/data_manage/business_sys_interaction_log.go

@@ -7,7 +7,8 @@ import (
 
 // BusinessSysInteractionLog 商家系统交互记录表
 type BusinessSysInteractionLog struct {
-	ID             uint32    `orm:"column(id);pk" gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
+	//ID             uint32    `orm:"column(id);pk" gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
+	ID             uint32    `gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
 	InteractionKey string    `gorm:"unique;column:interaction_key;type:varchar(128);not null;default:''" json:"interactionKey"` // 记录Key
 	InteractionVal string    `gorm:"column:interaction_val;type:text;default:null" json:"interactionVal"`                       // 记录值
 	Remark         string    `gorm:"column:remark;type:varchar(128);not null;default:''" json:"remark"`                         // 备注

models/data_manage/chart_edb_mapping.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ChartEdbMapping struct {
-	ChartEdbMappingId int       `orm:"column(chart_edb_mapping_id);pk"`
+	ChartEdbMappingId int       `gorm:"column:chart_edb_mapping_id;primaryKey"` // `orm:"column(chart_edb_mapping_id);pk"`
 	ChartInfoId       int       `description:"图表id"`
 	EdbInfoId         int       `description:"指标id"`
 	CreateTime        time.Time `description:"创建时间"`

models/data_manage/chart_info.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ChartInfo struct {
-	ChartInfoId     int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId     int    `gorm:"column:chart_info_id;primaryKey"` //  `orm:"column(chart_info_id);pk"`
 	ChartName       string `description:"来源名称"`
 	ChartClassifyId int    `description:"图表分类id"`
 	SysUserId       int

models/data_manage/com_trade_data.go

@@ -8,7 +8,7 @@ import (
 
 // ComTradeData 联合国商品贸易数据表
 type ComTradeData struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `gorm:"column:com_trade_data_id;primaryKey"` // `orm:"column(com_trade_data_id);pk"`
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	Flow               string    `description:"贸易流向：X（Export：出口）；M（Import：进口）"`

models/data_manage/com_trade_index.go

@@ -8,7 +8,7 @@ import (
 
 // ComTradeIndex 联合国商品贸易数据指标表
 type ComTradeIndex struct {
-	ComTradeId  int       `orm:"column(com_trade_id);pk"`
+	ComTradeId  int       `gorm:"column:com_trade_id;primaryKey"` // `orm:"column(com_trade_id);pk"`
 	IndexCode   string    `description:"联合国商品贸易编码"`
 	IndexName   string    `description:"联合国商品名称"`
 	IndexNameCn string    `description:"联合国商品名称（中文）"`
@@ -49,7 +49,7 @@ func AddBaseFromComTradeIndex(item *ComTradeIndex) (lastId int64, err error) {
 
 // ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
 type ComTradeCodeMapping struct {
-	Code       string    `orm:"column(code);pk"`
+	Code       string    `gorm:"column:code;primaryKey"` // `orm:"column(code);pk"`
 	IndexCode  string    `description:"联合国商品贸易编码"`
 	Type       int       `description:"1:价格；2：重量"`
 	Name       string    `description:"指标名称"`

models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -8,7 +8,7 @@ import (
 // ChartInfoCrossVariety
 // @Description: 跨品种分析配置表
 type ChartInfoCrossVariety struct {
-	Id             int       `orm:"column(id);pk"`
+	Id             int       `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ChartInfoId    int       `description:"图表id"`
 	ChartXTagId    int       `description:"X轴的标签ID"`
 	ChartYTagId    int       `description:"X轴的标签ID"`

models/data_manage/cross_variety/chart_tag_variety.go

@@ -9,7 +9,7 @@ import (
 // ChartTagVariety
 // @Description: chart_tag_variety 图表标签品种关系表
 type ChartTagVariety struct {
-	Id                        int       `orm:"column(id);pk"`
+	Id                        int       `gorm:"column:id;primaryKey"` //   `orm:"column(id);pk"`
 	ChartTagId                int       `description:"标签id"`
 	ChartVarietyId            int       `description:"品种id"`
 	EdbInfoId                 int       `description:"指标id"`

models/data_manage/edb_classify.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbClassify struct {
-	ClassifyID         int64 `orm:"column(classify_id);pk"`
+	ClassifyID         int64 `gorm:"column:classify_id;primaryKey"` //`orm:"column(classify_id);pk"`
 	ClassifyType       uint32
 	ClassifyName       string
 	ParentID           int64

models/data_manage/edb_data_base.go

@@ -377,7 +377,7 @@ func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr, value string) (addSql
 }
 
 type EdbDataBase struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_calculate.go

@@ -42,7 +42,7 @@ func DeleteEdbDataCalculateBySql(deleteStr string, edbInfoId int) (err error) {
 }
 
 type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoCalculateId int       `gorm:"column:edb_info_calculate_id;primaryKey"` // `orm:"column(edb_info_calculate_id);pk"`
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`

models/data_manage/edb_data_calculate_ljztbpj.go

@@ -7,7 +7,7 @@ import (
 
 // EdbDataCalculateLjztbpj 累计值同比拼接数据结构体
 type EdbDataCalculateLjztbpj struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_calculate_zjpj.go

@@ -7,7 +7,7 @@ import (
 
 // EdbDataCalculateZjpj 直接拼接数据结构体
 type EdbDataCalculateZjpj struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_cffex.go

@@ -15,7 +15,7 @@ type CffexData struct {
 }
 
 type BaseFromCffexDataSimple struct {
-	Id        int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -32,7 +32,7 @@ type BaseInfoFromCffex struct {
 }
 
 type BaseFromTradeCFFEXIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"` //`orm:"column(base_from_trade_cffex_index_id);pk"`
 	Rank                      int
 	DealShortName             string
 	DealName                  string

models/data_manage/edb_data_dl.go

@@ -15,7 +15,7 @@ type DlData struct {
 }
 
 type BaseFromDlDataSimple struct {
-	Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"` //`orm:"column(base_from_trade_dalian_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string

models/data_manage/edb_data_lt.go

@@ -10,7 +10,7 @@ import (
 )
 
 type EdbDataLt struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_lz.go

@@ -10,7 +10,7 @@ type lzSurveyData struct {
 }
 
 type LongzhongSurveyData struct {
-	SurveyDataId         int `orm:"column(survey_data_id);pk"`
+	SurveyDataId         int `gorm:"column:survey_data_id;primaryKey"` //`orm:"column(survey_data_id);pk"`
 	SurveyProductId      int
 	ProjectQuotaId       int64
 	BreedId              string

models/data_manage/edb_data_manual.go

@@ -26,7 +26,7 @@ func GetEdbDataManualMaxOrMinDate(edbCode string) (min_date, max_date string, er
 }
 
 type ManualEdbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;primaryKey"` // `orm:"column(TRADE_CODE);pk" description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      float64   `orm:"column(CLOSE)" description:"值"`
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`

models/data_manage/edb_data_pb.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbDataPb struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` // `orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_sh.go

@@ -15,7 +15,7 @@ type ShData struct {
 }
 
 type BaseFromShDataSimple struct {
-	Id        int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -32,7 +32,7 @@ type BaseInfoFromSh struct {
 }
 
 type BaseFromTradeShIndex struct {
-	BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"` //`orm:"column(base_from_trade_shanghai_index_id);pk"`
 	Rank                   int
 	DealShortName          string
 	DealName               string

models/data_manage/edb_data_shfe.go

@@ -15,7 +15,7 @@ type ShfeData struct {
 }
 
 type BaseFromShfeDataSimple struct {
-	Id        int `orm:"column(base_from_trade_ine_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` // `orm:"column(base_from_trade_ine_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -32,7 +32,7 @@ type BaseInfoFromShfe struct {
 }
 
 type BaseFromTradeShfeIndex struct {
-	BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeShfeIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"` //`orm:"column(base_from_trade_ine_index_id);pk"`
 	Rank                     int
 	DealShortName            string
 	DealName                 string

models/data_manage/edb_data_ths.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbDataThs struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_wind.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbDataWind struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` //`orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_ys.go

@@ -21,7 +21,7 @@ import (
 )
 
 type EdbDataYs struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"` // `orm:"column(edb_data_id);pk"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_data_zz.go

@@ -15,7 +15,7 @@ type ZzData struct {
 }
 
 type BaseFromZzDataSimple struct {
-	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"` //`orm:"column(base_from_trade_zhengzhou_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string

models/data_manage/edb_info.go

@@ -10,7 +10,7 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int    `gorm:"column:edb_info_id;primaryKey"` //`orm:"column(edb_info_id);pk"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`
 	EdbCode          string `description:"指标编码"`
@@ -35,7 +35,7 @@ type EdbInfo struct {
 }
 
 type EdbInfoList struct {
-	EdbInfoId        int       `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int       `gorm:"column:edb_info_id;primaryKey"` //  `orm:"column(edb_info_id);pk"`
 	SourceName       string    `description:"来源名称"`
 	Source           int       `description:"来源id"`
 	SubSource        int       `description:"子数据来源:0:经济数据库,1:日期序列"`
@@ -243,7 +243,7 @@ func DeleteEdbDataByIdAndSource(edbDataId, source, subSource int) (err error) {
 }
 
 type EdbInfoClassify struct {
-	EdbInfoId       int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId       int    `gorm:"column:edb_info_id;primaryKey"` // `orm:"column(edb_info_id);pk"`
 	SourceName      string `description:"来源名称"`
 	Source          int    `description:"来源id"`
 	EdbCode         string `description:"指标编码"`

models/data_manage/edb_info_calculate_mapping.go

@@ -8,7 +8,7 @@ import (
 )
 
 type EdbInfoCalculateMapping struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `gorm:"column:edb_info_calculate_mapping_id;primaryKey"` //`orm:"column(edb_info_calculate_mapping_id);pk"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -92,7 +92,7 @@ func FixEdbInfoCalculateMapping() {
 }
 
 type EdbInfoCalculateMappingView struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `gorm:"column:edb_info_calculate_mapping_id;primaryKey"` //  `orm:"column(edb_info_calculate_mapping_id);pk"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -139,7 +139,7 @@ func GetAllCalculateEdbIdsByEdbInfoIds(edbInfoIds []int) (edbIds []int, err erro
 // EdbInfoCalculateMappingInfo
 // @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `gorm:"column:edb_info_calculate_mapping_id;primaryKey"` //   `orm:"column(edb_info_calculate_mapping_id);pk"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`

models/data_manage/edb_info_relation.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbInfoRelation struct {
-	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk"`
+	EdbInfoRelationId  int       `gorm:"column:edb_info_relation_id;primaryKey"` //  `orm:"column(edb_info_relation_id);pk"`
 	EdbInfoId          int       `description:"指标id"`
 	Source             int       `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
 	EdbName            string    `description:"指标名称"`

models/data_manage/edb_info_update_log.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbInfoUpdateLog struct {
-	Id                     int       `orm:"column(id);pk"`
+	Id                     int       `gorm:"column:id;primaryKey"` //  `orm:"column(id);pk"`
 	EdbInfoId              int       `description:"指标id"`
 	SourceName             string    `description:"来源名称"`
 	Source                 int       `description:"来源id"`

models/data_manage/edb_refresh/edb_refresh_config.go

@@ -9,7 +9,7 @@ import (
 // EdbRefreshConfig
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
-	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk"`
+	EdbRefreshConfigId  int       `gorm:"column:edb_refresh_config_id;primaryKey"` //  `orm:"column(edb_refresh_config_id);pk"`
 	RefreshFrequency    string    `description:"刷新频率"`
 	RefreshFrequencyDay int       `description:"具体刷新的日期"`
 	RefreshTime         string    `description:"刷新时间"`

models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -10,7 +10,7 @@ import (
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `orm:"column(id);pk"`
+	Id                  int       `gorm:"column:id;primaryKey"` //   `orm:"column(id);pk"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	Frequency           string    `description:"频度"`

models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -10,7 +10,7 @@ import (
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk"`
+	EdbRefreshMappingId int       `gorm:"column:edb_refresh_mapping_id;primaryKey"` //  `orm:"column(edb_refresh_mapping_id);pk"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	EdbInfoId           int       `description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
@@ -72,7 +72,7 @@ func (m *EdbRefreshMapping) Delete() (err error) {
 }
 
 type EdbInfoListAndRefreshConfig struct {
-	EdbInfoId          int       `orm:"column(edb_info_id);pk"`
+	EdbInfoId          int       `gorm:"column:edb_info_id;primaryKey"` //  `orm:"column(edb_info_id);pk"`
 	SourceName         string    `description:"来源名称"`
 	Source             int       `description:"来源id"`
 	SubSource          int       `description:"子数据来源:0:经济数据库,1:日期序列"`

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -8,7 +8,7 @@ import (
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `orm:"column(id);pk"`
+	Id            int       `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
 	Source        int       `orm:"column(source)" description:"来源"`
 	SourceName    string    `description:"来源名称"`
 	SubSource     int       `description:"子数据来源:0:经济数据库,1:日期序列"`

models/data_manage/edb_source.go

@@ -17,7 +17,7 @@ var (
 
 // EdbSource 指标来源表
 type EdbSource struct {
-	EdbSourceId      int    `orm:"column(edb_source_id);pk"`
+	EdbSourceId      int    `gorm:"column:edb_source_id;primaryKey"` // `orm:"column(edb_source_id);pk"`
 	SourceName       string `description:"指标来源名称"`
 	TableName        string `description:"数据表名"`
 	EdbAddMethod     string `description:"指标新增接口"`

models/data_manage/edb_update_log.go

@@ -7,13 +7,13 @@ import (
 )
 
 type EdbUpdateLog struct {
-	Id          int64     `json:"id" orm:"column(id);pk"`
-	OpDbName    string    `json:"op_db_name"`    // 库名
-	OpTableName string    `json:"op_table_name"` // 表名
-	OpType      string    `json:"op_type"`       // 变更类型
-	OldData     string    `json:"old_data"`      // 历史数据
-	NewData     string    `json:"new_data"`      // 新数据
-	IsHandle    int       `json:"is_handle"`     // 是否处理，0：未处理，1：已处理；默认：0
+	Id          int64     `gorm:"column:id;primaryKey" json:"id"` // `json:"id" orm:"column(id);pk"`
+	OpDbName    string    `json:"op_db_name"`                     // 库名
+	OpTableName string    `json:"op_table_name"`                  // 表名
+	OpType      string    `json:"op_type"`                        // 变更类型
+	OldData     string    `json:"old_data"`                       // 历史数据
+	NewData     string    `json:"new_data"`                       // 新数据
+	IsHandle    int       `json:"is_handle"`                      // 是否处理，0：未处理，1：已处理；默认：0
 	ModifyTime  time.Time `json:"modify_time"`
 	CreateTime  time.Time `json:"create_time"`
 }
@@ -137,9 +137,9 @@ type EdbInfoItem struct {
 }
 
 type EdbData struct {
-	EdbDataId int32  `orm:"column(edb_data_id);pk" json:"edb_data_id"`
-	EdbInfoId int32  `json:"edb_info_id"` // 指标id
-	EdbCode   string `json:"edb_code"`    // 指标编码
+	EdbDataId int32  `gorm:"column:edb_data_id;primaryKey"  json:"edb_data_id"` // `orm:"column(edb_data_id);pk" json:"edb_data_id"`
+	EdbInfoId int32  `json:"edb_info_id"`                                       // 指标id
+	EdbCode   string `json:"edb_code"`                                          // 指标编码
 	//DataTime      time.Time `json:"data_time"`      // 数据日期
 	DataTime string  `json:"data_time"` // 数据日期
 	Value    float64 `json:"value"`     // 数据值

models/data_manage/excel/excel_edb_mapping.go

@@ -8,7 +8,7 @@ import (
 
 // ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
-	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk"`
+	ExcelEdbMappingId int       `gorm:"column:excel_edb_mapping_id;primaryKey"` //    `orm:"column(excel_edb_mapping_id);pk"`
 	ExcelInfoId       int       `description:"excel的id"`
 	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
 	EdbInfoId         int       `description:"计算指标id"`

models/data_manage/factor_edb_series_chart_mapping.go

@@ -14,7 +14,7 @@ const (
 
 // FactorEdbSeriesChartMapping 因子指标系列-图表关联
 type FactorEdbSeriesChartMapping struct {
-	FactorEdbSeriesChartMappingId int       `orm:"column(factor_edb_series_chart_mapping_id);pk"`
+	FactorEdbSeriesChartMappingId int       `gorm:"column:factor_edb_series_chart_mapping_id;primaryKey"` //   `orm:"column(factor_edb_series_chart_mapping_id);pk"`
 	ChartInfoId                   int       `description:"图表ID"`
 	Source                        int       `description:"图表来源, 同chart_info表source"`
 	CalculateType                 int       `description:"计算方式: 1-相关性"`

models/data_manage/factor_edb_series_mapping.go

@@ -10,7 +10,7 @@ import (
 
 // FactorEdbSeriesMapping 因子指标系列-指标关联表
 type FactorEdbSeriesMapping struct {
-	FactorEdbSeriesMappingId int       `orm:"column(factor_edb_series_mapping_id);pk"`
+	FactorEdbSeriesMappingId int       `gorm:"column:factor_edb_series_mapping_id;primaryKey"` //  `orm:"column(factor_edb_series_mapping_id);pk"`
 	FactorEdbSeriesId        int       `description:"因子指标系列ID"`
 	EdbInfoId                int       `description:"指标ID"`
 	EdbCode                  string    `description:"指标编码"`

models/data_manage/future_good/future_good_edb_info.go

@@ -7,7 +7,7 @@ import (
 
 // FutureGoodEdbInfo 期货指标表
 type FutureGoodEdbInfo struct {
-	FutureGoodEdbInfoId int       `orm:"column(future_good_edb_info_id);pk"`
+	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id;primaryKey"` // `orm:"column(future_good_edb_info_id);pk"`
 	FutureGoodEdbCode   string    `description:"期货指标code"`
 	FutureGoodEdbName   string    `description:"期货指标名称"`
 	FutureGoodEdbNameEn string    `description:"期货指标英文名称"`

models/data_manage/meeting_probabilities.go

@@ -7,7 +7,7 @@ import (
 
 // MeetingProbabilities excel表格详情表
 type MeetingProbabilities struct {
-	MeetingInfoId int       `orm:"column(meeting_info_id);pk"`
+	MeetingInfoId int       `gorm:"column:meeting_info_id;primaryKey"` //`orm:"column(meeting_info_id);pk"`
 	Content       string    `description:"表格内容"`
 	ExcelImage    string    `description:"表格图片"`
 	DateTime      string    `description:"数据日期"`

models/data_manage/trade_position_analysis.go

@@ -10,7 +10,7 @@ import (
 
 // 持仓榜单表
 type TradePositionTop struct {
-	Id            uint64    `orm:"column(id);pk"`
+	Id            uint64    `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
 	ClassifyName  string    //分类名称
 	ClassifyType  string    //分类名称下的类型
 	DataTime      string    //数据日期
@@ -335,7 +335,7 @@ func GetTradePositionTopOriginDataTimes(exchange string) (dates []string, err er
 
 // BaseFromTradeClassify 交易所分类表
 type BaseFromTradeClassify struct {
-	Id           uint64    `orm:"column(id);pk"`
+	Id           uint64    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ClassifyName string    //分类名称
 	ClassifyType string    //分类名称下的类型
 	Exchange     string    //交易所

models/edbinfo_send_msg_record.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbinfoSendMsgRecord struct {
-	Id         int `orm:"column(id);pk"`
+	Id         int `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	UserId     int
 	TradeCode  string
 	CreateTime time.Time

models/fe_calendar/fe_calendar_matter.go

@@ -15,7 +15,7 @@ const (
 
 // FeCalendarMatter 外汇日历-事项表
 type FeCalendarMatter struct {
-	FeCalendarMatterId  int       `orm:"column(fe_calendar_matter_id);pk" description:"事项ID"`
+	FeCalendarMatterId  int       `gorm:"column:fe_calendar_matter_id;primaryKey"` // `orm:"column(fe_calendar_matter_id);pk" description:"事项ID"`
 	ChartPermissionId   int       `description:"品种ID"`
 	ChartPermissionName string    `description:"品种名称"`
 	MatterMonth         string    `description:"事项年月：格式2006-01"`

models/index_notice.go

@@ -27,7 +27,7 @@ func GetEdbInfoByFrequencyNotDay() (items []*EdbInfo, err error) {
 }
 
 type Edbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;primaryKey"` // `orm:"column(TRADE_CODE);pk" description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      string    `orm:"column(CLOSE)" description:"值"`
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`

models/report.go

@@ -148,7 +148,7 @@ func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, play
 }
 
 type ReportChapterTypePermission struct {
-	Id                    int       `orm:"column(id);pk" description:"主键ID"`
+	Id                    int       `gorm:"column:id;primaryKey"` //   `orm:"column(id);pk" description:"主键ID"`
 	ReportChapterTypeId   int       `description:"报告章节类型ID"`
 	ReportChapterTypeName string    `description:"章节名称"`
 	ChartPermissionId     int       `description:"大分类ID"`

models/report_chapter.go

@@ -7,7 +7,7 @@ import (
 
 // ReportChapter 报告章节
 type ReportChapter struct {
-	ReportChapterId   int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
+	ReportChapterId   int       `gorm:"column:report_chapter_id;primaryKey"` // `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
 	ReportId          int       `description:"报告ID"`
 	ReportType        string    `description:"报告类型 day-晨报 week-周报"`
 	ClassifyIdFirst   int       `description:"一级分类id"`

models/sandbox/sandbox.go

@@ -25,7 +25,7 @@ import (
 //}
 
 type Sandbox struct {
-	SandboxId         int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
+	SandboxId         int       `gorm:"column:sandbox_id;primaryKey"` //`orm:"column(sandbox_id);pk" description:"沙盘id"`
 	Name              string    `description:"沙盘名称"`
 	Code              string    `description:"沙盘code"`
 	Content           string    `description:"沙盘数据"`