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 *SysConfigSearch) Bind(ctx *gin.Context) error {
// SysConfigControl 增、改使用的结构体
type SysConfigControl struct {
ID int `uri:"ID" comment:"编码"` // 编码
ID int `uri:"Id" comment:"编码"` // 编码
ConfigName string `json:"configName" comment:""`
ConfigKey string `uri:"configKey" json:"configKey" comment:""`
ConfigValue string `json:"configValue" comment:""`
@@ -67,7 +67,7 @@ func (s *SysConfigControl) Bind(ctx *gin.Context) error {
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
func (s *SysConfigControl) Generate() (*system.SysConfig, error) {
return &system.SysConfig{
Model: common.Model{ID: s.ID},
Model: common.Model{Id: s.ID},
ConfigName: s.ConfigName,
ConfigKey: s.ConfigKey,
ConfigValue: s.ConfigValue,
@@ -112,4 +112,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
return &system.SysConfig{}, nil
}
}