Merge branch 'develop' of k.zhang/duoduo into master

models/shanghu/cancel_log.go

@@ -14,7 +14,7 @@ type CancelLog struct {
 	CreateBy       int64     `gorm:"column:create_by;type:bigint(20)" json:"create_by"`
 	CreatedAt      time.Time `gorm:"column:created_at;type:datetime" json:"created_at"`
 	UpdatedAt      time.Time `gorm:"column:updated_at;type:datetime" json:"updated_at"`
-	DeletedAt      time.Time `gorm:"column:deleted_at;type:datetime" json:"deleted_at"`
+	DeletedAt      time.Time `gorm:"column:deleted_at;type:datetime;default:null" json:"deleted_at"`
 }
 
 func (m *CancelLog) TableName() string {