修改主键

models/chart_permission.go

@@ -13,30 +13,30 @@ const (
 
 // ChartPermission 报告权限表
 type ChartPermission struct {
-	ChartPermissionId     int       `gorm:"column:chart_permission_id"`     //`orm:"column(chart_permission_id);pk" gorm:"primaryKey"  description:"问题ID" json:"chart_permission_id"`
-	ChartPermissionName   string    `gorm:"column:chart_permission_name"`   //`description:"名称" json:"chart_permission_name"`
-	PermissionName        string    `gorm:"column:permission_name"`         //`description:"权限名" json:"permission_name"`
-	Sort                  int       `gorm:"column:sort"`                    //`description:"排序" json:"sort"`
-	Enabled               int       `gorm:"column:enabled"`                 //`description:"是否可用" json:"enabled"`
-	CreatedTime           time.Time `gorm:"column:created_time"`            //`description:"创建时间" json:"created_time"`
-	LastUpdatedTime       time.Time `gorm:"column:last_updated_time"`       //`description:"更新时间" json:"last_updated_time"`
-	TeleconferenceSort    int       `gorm:"column:teleconference_sort"`     //`description:"电话会类型排序" json:"teleconference_sort"`
-	Remark                string    `gorm:"column:remark"`                  //`description:"备注" json:"remark"`
-	ClassifyName          string    `gorm:"column:classify_name"`           //`description:"分类名称" json:"classify_name"`
-	ProductName           string    `gorm:"column:product_name"`            //`description:"产品名称" json:"product_name"`
-	ProductId             int       `gorm:"column:product_id"`              //`description:"产品ID" json:"product_id"`
-	ImageURL              string    `gorm:"column:image_url"`               //`orm:"column(image_url);" description:"图片地址" json:"image_url"`
-	ShowType              int       `gorm:"column:show_type"`               //`description:"1:查研观向小程序展示" json:"show_type"`
-	IsOther               int       `gorm:"column:is_other"`                //`description:"是否是其他，用于查研观向小程序后台展示" json:"is_other"`
-	IsReport              int       `gorm:"column:is_report"`               //`description:"是否是报告，用于查研观向小程序前台报告展示" json:"is_report"`
-	CygxAuth              int       `gorm:"column:cygx_auth"`               //`description:"是否是权限，用于查研观向小程序前台权限校验" json:"cygx_auth"`
-	PermissionType        int       `gorm:"column:permission_type"`         //`description:"1主观，2客观" json:"permission_type"`
-	YbImgUrl              string    `gorm:"column:yb_img_url"`              //`description:"研报小程序报告列表icon" json:"yb_img_url"`
-	ProductPermissionName string    `gorm:"column:product_permission_name"` //`description:"种类权限名称" json:"product_permission_name"`
-	PriceDrivenState      int       `gorm:"column:price_driven_state"`      //`description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
-	ImageUrlM             string    `gorm:"column:image_url_m"`             //`description:"图片地址(查研观向移动端)" json:"image_url_m"`
-	ParentId              int       `gorm:"column:parent_id"`               //`description:"父级权限id" json:"parent_id"`
-	IsPublic              int       `gorm:"column:is_public"`               //`description:"是否是公有权限1:公有权限，0私有权限" json:"is_public"`
+	ChartPermissionId     int       `gorm:"column:chart_permission_id;primaryKey"` //`orm:"column(chart_permission_id);pk" gorm:"primaryKey"  description:"问题ID" json:"chart_permission_id"`
+	ChartPermissionName   string    `gorm:"column:chart_permission_name"`          //`description:"名称" json:"chart_permission_name"`
+	PermissionName        string    `gorm:"column:permission_name"`                //`description:"权限名" json:"permission_name"`
+	Sort                  int       `gorm:"column:sort"`                           //`description:"排序" json:"sort"`
+	Enabled               int       `gorm:"column:enabled"`                        //`description:"是否可用" json:"enabled"`
+	CreatedTime           time.Time `gorm:"column:created_time"`                   //`description:"创建时间" json:"created_time"`
+	LastUpdatedTime       time.Time `gorm:"column:last_updated_time"`              //`description:"更新时间" json:"last_updated_time"`
+	TeleconferenceSort    int       `gorm:"column:teleconference_sort"`            //`description:"电话会类型排序" json:"teleconference_sort"`
+	Remark                string    `gorm:"column:remark"`                         //`description:"备注" json:"remark"`
+	ClassifyName          string    `gorm:"column:classify_name"`                  //`description:"分类名称" json:"classify_name"`
+	ProductName           string    `gorm:"column:product_name"`                   //`description:"产品名称" json:"product_name"`
+	ProductId             int       `gorm:"column:product_id"`                     //`description:"产品ID" json:"product_id"`
+	ImageURL              string    `gorm:"column:image_url"`                      //`orm:"column(image_url);" description:"图片地址" json:"image_url"`
+	ShowType              int       `gorm:"column:show_type"`                      //`description:"1:查研观向小程序展示" json:"show_type"`
+	IsOther               int       `gorm:"column:is_other"`                       //`description:"是否是其他，用于查研观向小程序后台展示" json:"is_other"`
+	IsReport              int       `gorm:"column:is_report"`                      //`description:"是否是报告，用于查研观向小程序前台报告展示" json:"is_report"`
+	CygxAuth              int       `gorm:"column:cygx_auth"`                      //`description:"是否是权限，用于查研观向小程序前台权限校验" json:"cygx_auth"`
+	PermissionType        int       `gorm:"column:permission_type"`                //`description:"1主观，2客观" json:"permission_type"`
+	YbImgUrl              string    `gorm:"column:yb_img_url"`                     //`description:"研报小程序报告列表icon" json:"yb_img_url"`
+	ProductPermissionName string    `gorm:"column:product_permission_name"`        //`description:"种类权限名称" json:"product_permission_name"`
+	PriceDrivenState      int       `gorm:"column:price_driven_state"`             //`description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
+	ImageUrlM             string    `gorm:"column:image_url_m"`                    //`description:"图片地址(查研观向移动端)" json:"image_url_m"`
+	ParentId              int       `gorm:"column:parent_id"`                      //`description:"父级权限id" json:"parent_id"`
+	IsPublic              int       `gorm:"column:is_public"`                      //`description:"是否是公有权限1:公有权限，0私有权限" json:"is_public"`
 }
 
 type ChartPermissionItem struct {

models/classify_menu.go

@@ -9,12 +9,12 @@ import (
 
 // ClassifyMenu 报告分类-子目录表
 type ClassifyMenu struct {
-	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk" gorm:"primaryKey" `
-	MenuName   string    `gorm:"column:mobile"`      //`description:"子目录名称"`
-	ClassifyId int       `gorm:"column:classify_id"` //`description:"一级分类ID"`
-	Sort       int       `gorm:"column:sort"`        //`description:"排序"`
-	CreateTime time.Time `gorm:"column:create_time"` //`description:"创建时间"`
-	ModifyTime time.Time `gorm:"column:modify_time"` //`description:"更新时间"`
+	MenuId     int       `gorm:"column:menu_id;primaryKey"` // `orm:"column(menu_id);pk" gorm:"primaryKey" `
+	MenuName   string    `gorm:"column:mobile"`             //`description:"子目录名称"`
+	ClassifyId int       `gorm:"column:classify_id"`        //`description:"一级分类ID"`
+	Sort       int       `gorm:"column:sort"`               //`description:"排序"`
+	CreateTime time.Time `gorm:"column:create_time"`        //`description:"创建时间"`
+	ModifyTime time.Time `gorm:"column:modify_time"`        //`description:"更新时间"`
 }
 
 func (item *ClassifyMenu) TableName() string {

models/classify_menu_relation.go

@@ -8,10 +8,10 @@ import (
 
 // ClassifyMenuRelation 报告分类-子目录关联表
 type ClassifyMenuRelation struct {
-	Id         int       `gorm:"column:id"`          //`orm:"column(id);pk" gorm:"primaryKey" `
-	MenuId     int       `gorm:"column:menu_id"`     //`description:"子目录ID"`
-	ClassifyId int       `gorm:"column:classify_id"` //`description:"二级分类ID"`
-	CreateTime time.Time `gorm:"column:create_time"` //`description:"创建时间"`
+	Id         int       `gorm:"column:id;primaryKey"` //`orm:"column(id);pk" gorm:"primaryKey" `
+	MenuId     int       `gorm:"column:menu_id"`       //`description:"子目录ID"`
+	ClassifyId int       `gorm:"column:classify_id"`   //`description:"二级分类ID"`
+	CreateTime time.Time `gorm:"column:create_time"`   //`description:"创建时间"`
 }
 
 func (item *ClassifyMenuRelation) TableName() string {

models/cloud_disk_menu.go

@@ -9,14 +9,14 @@ import (
 )
 
 type CloudDiskMenu struct {
-	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk" gorm:"primaryKey"  description:"目录ID"`
-	MenuName   string    `gorm:"column:menu_name"`   //`description:"目录名称"`
-	ParentId   int       `gorm:"column:parent_id"`   //`description:"父级ID"`
-	Size       int64     `gorm:"column:size"`        //`description:"目录大小"`
-	AdminId    int       `gorm:"column:admin_id"`    //`description:"创建人ID"`
-	AdminName  string    `gorm:"column:admin_name"`  //`description:"创建人名称"`
-	CreateTime time.Time `grom:"column:create_time"` //`description:"创建时间"`
-	ModifyTime time.Time `gorm:"column:modify_time"` //`description:"修改时间"`
+	MenuId     int       `gorm:"column:menu_id;primaryKey"` // `orm:"column(menu_id);pk" gorm:"primaryKey"  description:"目录ID"`
+	MenuName   string    `gorm:"column:menu_name"`          //`description:"目录名称"`
+	ParentId   int       `gorm:"column:parent_id"`          //`description:"父级ID"`
+	Size       int64     `gorm:"column:size"`               //`description:"目录大小"`
+	AdminId    int       `gorm:"column:admin_id"`           //`description:"创建人ID"`
+	AdminName  string    `gorm:"column:admin_name"`         //`description:"创建人名称"`
+	CreateTime time.Time `grom:"column:create_time"`        //`description:"创建时间"`
+	ModifyTime time.Time `gorm:"column:modify_time"`        //`description:"修改时间"`
 }
 
 func (m *CloudDiskMenu) TableName() string {

models/data_manage/base_from_sci_hq_index.go

@@ -9,7 +9,7 @@ import (
 )
 
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"pk" gorm:"primaryKey" `
+	BaseFromSciHqIndexId int       `gorm:"primaryKey" `
 	ClassifyId           int       `description:"指标分类id"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`

models/data_manage/base_from_smm.go

@@ -9,7 +9,7 @@ import (
 )
 
 type BaseFromSmm struct {
-	BaseFromSmmId int `orm:"column(base_from_smm_id);pk" gorm:"primaryKey" `
+	BaseFromSmmId int `gorm:"primaryKey" `
 	Aid           int
 	Name          string
 	Interface     string

models/data_manage/edb_classify.go

@@ -9,7 +9,7 @@ import (
 )
 
 type EdbClassify struct {
-	ClassifyId             int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
+	ClassifyId             int       `gorm:"primaryKey" `
 	ClassifyType           uint8     `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 	ClassifyName           string    `description:"分类名称"`
 	ParentId               int       `description:"父级id"`

models/data_manage/edb_data_pb.go

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

models/data_manage/edb_data_ths.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbDataThs struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
+	EdbDataId     int `gorm:"primaryKey" `
 	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" gorm:"primaryKey" `
+	EdbDataId     int `gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

models/data_manage/edb_info.go

@@ -19,7 +19,7 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk" gorm:"primaryKey" `
+	EdbInfoId        int    `gorm:"primaryKey" `
 	EdbInfoType      int    `description:"指标类型，0：普通指标，1：预测指标"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`

models/data_manage/edb_info_calculate.go

@@ -28,7 +28,7 @@ type EdbInfoFromTag struct {
 }
 
 type EdbInfoCalculate struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey" `
+	EdbInfoCalculateId int       `gorm:"primaryKey" `
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`

models/data_manage/excel_style.go

@@ -163,7 +163,7 @@ type Rowlen struct {
 }
 
 type ExcelEdbdataMapping struct {
-	MappingId  int `orm:"column(mapping_id);pk" gorm:"primaryKey" `
+	MappingId  int `gorm:"primaryKey" `
 	ExcelId    int64
 	ClassifyId int
 	Frequency  string

models/data_manage/manual_classify.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbdataClassify struct {
-	ClassifyId   int       `orm:"column(classify_id);pk" gorm:"primaryKey"  description:"分类id"`
+	ClassifyId   int       `gorm:"primaryKey"  description:"分类id"`
 	ClassifyName string    `description:"分类名称"`
 	ParentId     int       `description:"父级id"`
 	CreateTime   time.Time `description:"创建时间"`

models/data_manage/manual_user.go

@@ -8,7 +8,7 @@ import (
 )
 
 type ManualUser struct {
-	ManualUserId    int       `orm:"column(manual_user_id);pk" gorm:"primaryKey" `
+	ManualUserId    int       `gorm:"primaryKey" `
 	AdminId         int       `description:"用户id"`
 	AdminRealName   string    `description:"用户姓名"`
 	SysUserId       int       `description:"创建人id"`
@@ -73,7 +73,7 @@ type ManualSysUserClassifySaveReq struct {
 }
 
 type ManualUserClassify struct {
-	ManualUserClassifyId int `orm:"column(manual_user_classify_id);pk" gorm:"primaryKey" `
+	ManualUserClassifyId int `gorm:"primaryKey" `
 	AdminId              int
 	ClassifyId           int
 	CreateTime           time.Time

models/data_manage/search_keyword.go

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

models/db2.go

@@ -281,7 +281,7 @@ func initEdbData() {
 		new(data_manage.ManualUser),
 		new(data_manage.EdbInfoCalculate),
 		new(data_manage.SearchKeyword),
-		new(data_manage.BaseFromSmm),
+		new(data_manage.BaseFromSmm), //orm删除到此
 		new(data_manage.BaseFromSmmIndex),
 		new(data_manage.BaseFromSmmData),
 		new(data_manage.BaseFromSmmClassify),

models/english_company.go

@@ -14,7 +14,7 @@ const (
 
 // EnglishCompany 英文客户
 type EnglishCompany struct {
-	CompanyId   int       `gorm:"column:company_id;primary_key:true" description:"英文客户ID"`
+	CompanyId   int       `gorm:"column:company_id;primaryKey" description:"英文客户ID"`
 	CompanyName string    `gorm:"column:company_name" description:"客户名称"`
 	CountryCode string    `gorm:"column:country_code" description:"国家Code"`
 	Country     string    `gorm:"column:country" description:"国家"`

models/english_company_log.go

@@ -15,7 +15,7 @@ const (
 
 // EnglishCompanyLog 英文客户操作日志表
 type EnglishCompanyLog struct {
-	Id         int       `gorm:"column:id;primary_key:true" description:"日志ID"`
+	Id         int       `gorm:"column:id;primaryKey" description:"日志ID"`
 	CompanyId  int       `gorm:"column:company_id" description:"英文客户ID"`
 	AdminId    int       `gorm:"column:admin_id" description:"操作人ID"`
 	OptionData string    `gorm:"column:option_data" description:"操作数据-JSON"`

models/english_company_todo.go

@@ -17,7 +17,7 @@ const (
 
 // EnglishCompanyTodo 英文客户TODO任务
 type EnglishCompanyTodo struct {
-	Id                 int       `gorm:"column:id;primary_key:true" description:"任务ID"`
+	Id                 int       `gorm:"column:id;primaryKey" description:"任务ID"`
 	CompanyId          int       `gorm:"column:company_id" description:"客户ID"`
 	Content            string    `gorm:"column:content" description:"任务描述"`
 	SellerId           int       `gorm:"column:seller_id" description:"客户所属销售ID"`

models/english_company_todo_public.go

@@ -8,7 +8,7 @@ import (
 // EnglishCompanyTodoPublic 英文客户公共TODO任务
 
 type EnglishCompanyTodoPublic struct {
-	Id             int       `gorm:"column:id;primary_key:true" description:"任务ID"`
+	Id             int       `gorm:"column:id;primaryKey" description:"任务ID"`
 	Content        string    `gorm:"column:content" description:"任务描述"`
 	CreateUserId   int       `gorm:"column:create_user_id" description:"创建人用户ID"`
 	CreateUserName string    `gorm:"column:create_user_name" description:"创建人用户姓名"`

models/english_policy_report.go

@@ -10,7 +10,7 @@ import (
 
 // 英文策略报告
 type EnglishPolicyReport struct {
-	Id                 int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"策略报告ID"`
+	Id                 int       `gorm:"column:id;primaryKey;auto_increment:true" description:"策略报告ID"`
 	ClassifyIdFirst    int       `gorm:"column:classify_id_first" description:"一级分类ID"`
 	ClassifyNameFirst  string    `gorm:"column:classify_name_first" description:"一级分类名称"`
 	ClassifyIdSecond   int       `gorm:"column:classify_id_second" description:"二级分类ID"`

models/english_report_email.go

@@ -9,7 +9,7 @@ import (
 
 // EnglishReportEmail 英文研报-邮箱/客户联系人
 type EnglishReportEmail struct {
-	Id              int       `gorm:"column:id;primary_key:true" description:"邮箱ID"`
+	Id              int       `gorm:"column:id;primaryKey" description:"邮箱ID"`
 	CompanyId       int       `gorm:"column:company_id" description:"客户ID"`
 	Name            string    `gorm:"column:name" description:"联系人名称"`
 	Email           string    `gorm:"column:email" description:"邮箱地址"`

models/english_report_email_log.go

@@ -18,7 +18,7 @@ const (
 
 // EnglishReportEmailLog 英文研报-邮件推送记录
 type EnglishReportEmailLog struct {
-	Id           int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"邮箱日志ID"`
+	Id           int       `gorm:"column:id;primaryKey;auto_increment:true" description:"邮箱日志ID"`
 	ReportId     int       `gorm:"column:report_id" description:"报告ID或者线上路演ID"`
 	ReportType   int       `gorm:"column:report_type" description:"类型：0英文研报，1英文线上路演"`
 	EmailId      int       `gorm:"column:email_id" description:"邮箱ID"`

models/english_report_email_op_log.go

@@ -17,7 +17,7 @@ const (
 
 // EnglishReportEmailOpLog 英文邮箱/联系人-操作日志表
 type EnglishReportEmailOpLog struct {
-	Id         int       `gorm:"column:id;primary_key:true" description:"日志ID"`
+	Id         int       `gorm:"column:id;primaryKey" description:"日志ID"`
 	CompanyId  int       `gorm:"column:company_id" description:"客户ID"`
 	EmailId    int       `gorm:"column:email_id" description:"联系人ID"`
 	AdminId    int       `gorm:"column:admin_id" description:"操作人ID"`

models/english_report_email_pv.go

@@ -10,7 +10,7 @@ import (
 // EnglishReportEmailPV 英文研报-邮箱pv
 
 type EnglishReportEmailPV struct {
-	Id         int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"日志ID"`
+	Id         int       `gorm:"column:id;primaryKey;auto_increment:true" description:"日志ID"`
 	ReportId   int       `gorm:"column:report_id" description:"英文报告ID"`
 	EmailId    int       `gorm:"column:email_id" description:"邮箱ID"`
 	ReportType int       `gorm:"column:report_type" description:"类型：0英文研报，1英文线上路演"`

models/english_video.go

@@ -10,7 +10,7 @@ import (
 )
 
 type EnglishVideo struct {
-	Id                 int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"路演视频Id"`
+	Id                 int       `gorm:"column:id;primaryKey;auto_increment:true" description:"路演视频Id"`
 	ClassifyIdFirst    int       `gorm:"column:classify_id_first" description:"一级分类id"`
 	ClassifyNameFirst  string    `gorm:"column:classify_name_first" description:"一级分类名称"`
 	ClassifyIdSecond   int       `gorm:"column:classify_id_second" description:"二级分类id"`

models/permission.go

@@ -7,7 +7,7 @@ import (
 
 // ChartPermissionSearchKeyWordMapping 权限相关
 type ChartPermissionSearchKeyWordMapping struct {
-	Id                 int    `gorm:"column:id" json:"id"`                                   //`description:"id" json:"-"`
+	Id                 int    `gorm:"primaryKey" json:"id"`                                  //`description:"id" json:"-"`
 	ChartPermissionId  int    `gorm:"column:chart_permission_id" json:"chart_permission_id"` //`description:"权限id"`
 	KeyWord            string `gorm:"column:key_word" json:"key_word"`                       //`description:"二级分类名称"`
 	From               string `gorm:"column:from" json:"-"`                                  //`description:"类型标识" json:"-"`

models/ppt_v2.go

@@ -198,7 +198,7 @@ func EditPptV2Path(pptId int, pptxPath string) (err error) {
 
 // PptV2PublishRecord 发布记录表
 type PptV2PublishRecord struct {
-	Id         int `orm:"column(id);pk" gorm:"primaryKey" `
+	Id         int `gorm:"primaryKey" `
 	PptId      int
 	PptUrl     string
 	CreateTime time.Time

models/report.go

@@ -1253,7 +1253,7 @@ type SunCodeReq struct {
 
 // YbPcSuncode 活动海报表
 type YbPcSuncode struct {
-	SuncodeID  uint32    `gorm:"column:suncode_id" json:"suncodeId"`                             //`orm:"column(suncode_id);pk" gorm:"primaryKey"  `
+	SuncodeID  uint32    `gorm:"column:suncode_id;primaryKey" json:"suncodeId"`                  //`orm:"column(suncode_id);pk" gorm:"primaryKey"  `
 	Scene      string    `gorm:"column:scene;type:varchar(255);not null;default:0" json:"scene"` // 微信scene
 	SceneMd5   string    `gorm:"column:scene_md5;type:varchar(255);not null" json:"sceneMd5"`
 	CodePage   string    `gorm:"column:code_page;type:varchar(255);not null;default:''" json:"codePage"`     // 路径
@@ -1279,7 +1279,7 @@ func AddYbPcSunCode(item *YbPcSuncode) (err error) {
 
 // YbSuncodePars 小程序太阳码scene参数
 type YbSuncodePars struct {
-	ID         uint32    `gorm:"column:id" json:"id"`                                                    //`orm:"column(id);pk" gorm:"primaryKey"  `
+	ID         uint32    `gorm:"column:id;primaryKey" json:"id"`                                         //`orm:"column(id);pk" gorm:"primaryKey"  `
 	Scene      string    `gorm:"column:scene;type:varchar(255);not null;default:''" json:"scene"`        // scene参数
 	SceneKey   string    `gorm:"column:scene_key;type:varchar(32);not null;default:''" json:"scene_key"` // MD5值
 	CreateTime time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"createTime"`

models/report_author.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ReportAuthor struct {
-	Id           int       `gorm:"column:id"`            //`orm:"column(id)" description:"报告作者ID"`
+	Id           int       `gorm:"column:id;primaryKey"` //`orm:"column(id)" description:"报告作者ID"`
 	ReportAuthor string    `gorm:"column:report_author"` //`description:"报告作者名称"`
 	AuthorType   int       `gorm:"column:author_type"`   //`description:"类型，1：中文；2：英文"`
 	Enable       int       `gorm:"column:enable"`        //`description:"是否启用，0：禁用，1：启用"`

models/report_chapter_type.go

@@ -8,30 +8,30 @@ import (
 )
 
 type ReportChapterType struct {
-	ReportChapterTypeId        int       `gorm:"column:report_chapter_type_id"`         //`orm:"column(report_chapter_type_id);pk" gorm:"primaryKey"  description:"报告章节类型id"`
-	ReportChapterTypeKey       string    `gorm:"column:report_chapter_type_key"`        //`description:"章节key"`
-	ReportChapterTypeThumb     string    `gorm:"column:report_chapter_type_thumb"`      //`description:"H5展示的图片"`
-	BannerUrl                  string    `gorm:"column:banner_url"`                     //`description:"banner显示图片"`
-	ReportChapterTypeName      string    `gorm:"column:report_chapter_type_name"`       //`description:"报告章节类型名称"`
-	Sort                       int       `gorm:"column:sort"`                           //`description:"排序字段"`
-	Enabled                    int       `gorm:"column:enabled"`                        //`description:"启禁用状态"`
-	CreatedTime                time.Time `gorm:"column:created_time"`                   //`description:"创建时间"`
-	LastUpdatedTime            time.Time `gorm:"column:last_updated_time"`              //`description:"更新时间"`
-	ResearchType               string    `gorm:"column:research_type"`                  //`description:"研报类型"`
-	SelectedImage              string    `gorm:"column:selected_image"`                 //`description:"选中时的图片"`
-	UnselectedImage            string    `gorm:"column:unselected_image"`               //`description:"没选中时的图片"`
-	PcSelectedImage            string    `gorm:"column:pc_selected_image"`              //`description:"PC-选中的图片"`
-	PcUnselectedImage          string    `gorm:"column:pc_unselected_image"`            //`description:"PC-未选中的图片"`
-	EditImgUrl                 string    `gorm:"column:edit_img_url"`                   //`description:"管理后台编辑时选用的图"`
-	TickerTitle                string    `gorm:"column:ticker_title"`                   //`description:"指标列的标题"`
-	IsShow                     int       `gorm:"column:is_show"`                        //`description:"是否显示(研报小程序端根据此字段判断)"`
-	PauseStartTime             string    `gorm:"column:pause_start_time"`               //`description:"暂停开始日期"`
-	PauseEndTime               string    `gorm:"column:pause_end_time"`                 //`description:"暂停结束日期"`
-	IsSet                      int       `gorm:"column:is_set"`                         //`description:"是否设置:0为设置,1已设置"`
-	YbIconUrl                  string    `gorm:"column:yb_icon_url"`                    // `description:"研报小程序icon"`
-	YbBottomIcon               string    `gorm:"column:yb_bottom_icon"`                 // `description:"研报小程序详情底部icon"`
-	ReportClassifyId           int       `gorm:"column:report_classify_id"`             // `description:"所属分类id"`
-	InheritReportChapterTypeId int       `gorm:"column:inherit_report_chapter_type_id"` // `description:"继承的报告章节类型id"`
+	ReportChapterTypeId        int       `gorm:"column:report_chapter_type_id;primaryKey"` //`orm:"column(report_chapter_type_id);pk" gorm:"primaryKey"  description:"报告章节类型id"`
+	ReportChapterTypeKey       string    `gorm:"column:report_chapter_type_key"`           //`description:"章节key"`
+	ReportChapterTypeThumb     string    `gorm:"column:report_chapter_type_thumb"`         //`description:"H5展示的图片"`
+	BannerUrl                  string    `gorm:"column:banner_url"`                        //`description:"banner显示图片"`
+	ReportChapterTypeName      string    `gorm:"column:report_chapter_type_name"`          //`description:"报告章节类型名称"`
+	Sort                       int       `gorm:"column:sort"`                              //`description:"排序字段"`
+	Enabled                    int       `gorm:"column:enabled"`                           //`description:"启禁用状态"`
+	CreatedTime                time.Time `gorm:"column:created_time"`                      //`description:"创建时间"`
+	LastUpdatedTime            time.Time `gorm:"column:last_updated_time"`                 //`description:"更新时间"`
+	ResearchType               string    `gorm:"column:research_type"`                     //`description:"研报类型"`
+	SelectedImage              string    `gorm:"column:selected_image"`                    //`description:"选中时的图片"`
+	UnselectedImage            string    `gorm:"column:unselected_image"`                  //`description:"没选中时的图片"`
+	PcSelectedImage            string    `gorm:"column:pc_selected_image"`                 //`description:"PC-选中的图片"`
+	PcUnselectedImage          string    `gorm:"column:pc_unselected_image"`               //`description:"PC-未选中的图片"`
+	EditImgUrl                 string    `gorm:"column:edit_img_url"`                      //`description:"管理后台编辑时选用的图"`
+	TickerTitle                string    `gorm:"column:ticker_title"`                      //`description:"指标列的标题"`
+	IsShow                     int       `gorm:"column:is_show"`                           //`description:"是否显示(研报小程序端根据此字段判断)"`
+	PauseStartTime             string    `gorm:"column:pause_start_time"`                  //`description:"暂停开始日期"`
+	PauseEndTime               string    `gorm:"column:pause_end_time"`                    //`description:"暂停结束日期"`
+	IsSet                      int       `gorm:"column:is_set"`                            //`description:"是否设置:0为设置,1已设置"`
+	YbIconUrl                  string    `gorm:"column:yb_icon_url"`                       // `description:"研报小程序icon"`
+	YbBottomIcon               string    `gorm:"column:yb_bottom_icon"`                    // `description:"研报小程序详情底部icon"`
+	ReportClassifyId           int       `gorm:"column:report_classify_id"`                // `description:"所属分类id"`
+	InheritReportChapterTypeId int       `gorm:"column:inherit_report_chapter_type_id"`    // `description:"继承的报告章节类型id"`
 }
 
 func (r *ReportChapterType) Create() (err error) {

models/research_report.go

@@ -1,7 +1,7 @@
 package models
 
 type ChartPermissionChapterMapping struct {
-	Id                  int    `orm:"column(id);pk" gorm:"primaryKey" `
+	Id                  int    `gorm:"primaryKey" `
 	ChartPermissionId   int    `description:"权限ID"`
 	ReportChapterTypeId int    `description:"report_chapter_type表主键id或research_report表主键id或tactic表主键id"`
 	ResearchType        string `description:"报告类型 week;two_week;tactic;month;other;rddp; "`

models/system/sys_group.go

@@ -11,7 +11,7 @@ type SysGroupAddReq struct {
 }
 
 type SysGroup struct {
-	GroupId      int       `orm:"column(group_id);pk" description:"分组ID"`
+	GroupId      int       `gorm:"primaryKey"`
 	DepartmentId int       `description:"部门Id"`
 	ParentId     int       `description:"父级Id"`
 	GroupName    string    `description:"分组名称"`

models/system/sys_menu_button.go

@@ -7,7 +7,7 @@ import (
 )
 
 type SysMenuButton struct {
-	MenuButtonId int `orm:"column(menu_button_id);pk" description:"菜单按钮id"`
+	MenuButtonId int `gorm:"primaryKey" description:"菜单按钮id"`
 	MenuId       int
 	ButtonName   int
 	CreateTime   time.Time
@@ -37,7 +37,7 @@ type MenuButtonsResp struct {
 //}
 
 type SysRoleButton struct {
-	Id           int `orm:"column(id);pk" description:"关联id"`
+	Id           int `gorm:"primaryKey" description:"关联id"`
 	RoleId       int
 	MenuButtonId int
 	CreateTime   time.Time

models/system/sys_role.go

@@ -13,7 +13,7 @@ type SysRoleAddReq struct {
 }
 
 type SysRole struct {
-	RoleId       int       `orm:"column(role_id);pk" description:"角色ID"`
+	RoleId       int       `gorm:"primaryKey"`
 	RoleName     string    `description:"角色名称"`
 	RoleType     string    `description:"角色类型"`
 	RoleTypeCode string    `description:"角色类型编码"`
@@ -183,7 +183,7 @@ func DeleteRoleMenuByRoleId(roleId int) (err error) {
 }
 
 type SysRoleMenu struct {
-	RoleMenuId int `orm:"column(role_menu_id);pk" description:"关联id"`
+	RoleMenuId int `gorm:"primaryKey"`
 	RoleId     int
 	MenuId     int
 	Type       int `description:"类型：0-全选；1-半选（此字段仅用于前端的回显）"`

models/system/sys_role_admin.go

@@ -7,7 +7,7 @@ import (
 )
 
 type SysRoleAdmin struct {
-	Id         int       `orm:"column(id);pk" description:"自增ID"`
+	Id         int       `gorm:"primaryKey" description:"自增ID"`
 	AdminId    int       `orm:"column(admin_id);" description:"系统用户id"`
 	RoleId     int       `orm:"column(role_id);" description:"角色ID"`
 	CreateTime time.Time `orm:"column(create_time);" description:"创建时间"`

models/system/sys_session.go

@@ -6,7 +6,7 @@ import (
 )
 
 type SysSession struct {
-	Id              int `orm:"column(id);pk"`
+	Id              int `gorm:"primaryKey"`
 	SysUserId       int
 	UserName        string
 	AccessToken     string

models/system/sys_user_login_record.go

@@ -6,7 +6,7 @@ import (
 )
 
 type SysUserLoginRecord struct {
-	Id         int `orm:"column(id);pk"`
+	Id         int `gorm:"primaryKey"`
 	Uid        int
 	UserName   string
 	Ip         string

models/target.go

@@ -118,7 +118,7 @@ func EditEdbdata(item *Edbdata) (err error) {
 }
 
 type EdbdataDeleteRecord struct {
-	Id         int       `orm:"column(id);pk" gorm:"primaryKey" `
+	Id         int       `gorm:"primaryKey" `
 	TradeCode  string    `orm:"column(TRADE_CODE)" description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      string    `orm:"column(CLOSE)" description:"值"`

models/variety_tag.go

@@ -142,7 +142,7 @@ package models
 
 // ResearchVarietyTagRelation 研究员标签关系表
 type ResearchVarietyTagRelation struct {
-	Id           int `orm:"column(id);pk" gorm:"primaryKey" `
+	Id           int `gorm:"primaryKey" `
 	VarietyTagId int `json:"variety_tag_id" description:"标签ID"`
 	AdminId      int `json:"admin_id" description:"研究员ID"`
 }