meger:代码合并

rpc/partnerlib/crontab/service/docinUpdate.go

@@ -27,7 +27,7 @@ func UpdateDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 				doc.UpdateDate, _ = time.ParseInLocation(date.Date_Full_Layout, v.ModifyDate, time.Local)
 				doc.Price = int(v.Price * entity.Multiple)
 				doc.PriceVip = v.PriceVip
-				doc.ProductType = v.Ifcharge + entity.Charge
+				doc.ProductType = int64(v.Ifcharge + entity.Charge)
 				doc.DownOrUp = v.State
 				if err := partner.DocsUpdate(doc); err == nil {
 					actualTotal++

services/model/stdlib.go

@@ -31,8 +31,8 @@ type Doc struct {
 	PreviewImgId string `json:"previewImgId" gorm:"column:previewImgId"`
 	//PreviewImgUrl   string    `json:"preview_img_url" gorm:"column:previewImgUrl"`
 	EncryptionLevel int       `json:"encryptionLevel" gorm:"column:encryptionLevel"` //
-	Source          int       `json:"source" gorm:"column:source"`                   //
-	ProductType     int       `json:"productType" gorm:"column:productType"`         //分类
+	Source          int64     `json:"source" gorm:"column:source"`                   //
+	ProductType     int64     `json:"productType" gorm:"column:productType"`         //分类
 	UpdateDate      time.Time `json:"updateDate" gorm:"column:updateDate"`
 }