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

+3 -3
View File
@@ -35,7 +35,7 @@ func (m *SysCategorySearch) Generate() dto.Index {
}
type SysCategoryControl struct {
ID int `uri:"ID" comment:"标识"` // 标识
ID int `uri:"Id" comment:"标识"` // 标识
Name string `json:"name" comment:"名称"`
@@ -69,7 +69,7 @@ func (s *SysCategoryControl) Generate() dto.Control {
func (s *SysCategoryControl) GenerateM() (common.ActiveRecord, error) {
return &models.SysCategory{
Model: common.Model{ID: s.ID},
Model: common.Model{Id: s.ID},
Name: s.Name,
Img: s.Img,
Sort: s.Sort,
@@ -93,4 +93,4 @@ func (s *SysCategoryById) Generate() dto.Control {
func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) {
return &models.SysCategory{}, nil
}
}