Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	template/v4/dto.go.template
This commit is contained in:
linwenxiang committed 2021-03-04 23:47:14 +08:00
commit c294bb1585
33 files changed
+1014 -83

No files matched your search

+2 -2
View File
@@ -20,11 +20,11 @@ func (e *ControlBy) SetUpdateBy(updateBy int) {
}
type Model struct {
ID int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
}
type ModelTime struct {
CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"`
UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
DeletedAt gorm.DeletedAt `json:"-" gorm:"index;comment:删除时间"`
}
}