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
@@ -36,5 +36,5 @@ func (e *SysFileDir) Generate() models.ActiveRecord {
}
func (e *SysFileDir) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -27,5 +27,5 @@ func (e *SysFileInfo) Generate() models.ActiveRecord {
}
func (e *SysFileInfo) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -25,5 +25,5 @@ func (e *SysCategory) Generate() models.ActiveRecord {
}
func (e *SysCategory) GetId() interface{} {
return e.ID
}
return e.Id
}
+30
View File
@@ -0,0 +1,30 @@
package models
import (
"go-admin/common/models"
"time"
)
type SysChinaAreaData struct {
models.Model
models.ControlBy
PId string `json:"pId" gorm:"type:int(11);comment:上级编码"`
Name string `json:"name" gorm:"type:varchar(128);comment:名称"`
CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"`
UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"`
DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"`
}
func (SysChinaAreaData) TableName() string {
return "sys_china_area_data"
}
func (e *SysChinaAreaData) Generate() models.ActiveRecord {
o := *e
return &o
}
func (e *SysChinaAreaData) GetId() interface{} {
return e.Id
}
+2 -2
View File
@@ -25,5 +25,5 @@ func (e *SysConfig) Generate() models.ActiveRecord {
}
func (e *SysConfig) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -33,5 +33,5 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
}
func (e *SysLoginLog) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -41,5 +41,5 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
}
func (e *SysOperaLog) GetId() interface{} {
return e.ID
}
return e.Id
}
+27
View File
@@ -0,0 +1,27 @@
package models
import (
// "gorm.io/gorm"
"go-admin/common/models"
)
type WfProcessClassify struct {
models.Model
models.ControlBy
Name string `json:"name" gorm:"type:varchar(255);comment:名称"`
}
func (WfProcessClassify) TableName() string {
return "wf_process_classify"
}
func (e *WfProcessClassify) Generate() models.ActiveRecord {
o := *e
return &o
}
func (e *WfProcessClassify) GetId() interface{} {
return e.Id
}