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

# Conflicts:
#	template/v4/dto.go.template
This commit is contained in:
linwenxiang
2021-03-04 23:47:14 +08:00
33 changed files with 1014 additions and 83 deletions
+3 -3
View File
@@ -144,11 +144,11 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
listGroup := *list
min := make([]models.SysFileDirL, 0)
for j := 0; j < len(listGroup); j++ {
if m.ID != listGroup[j].PId {
if m.Id != listGroup[j].PId {
continue
}
mi := models.SysFileDirL{}
mi.ID = listGroup[j].ID
mi.Id = listGroup[j].Id
mi.PId = listGroup[j].PId
mi.Label = listGroup[j].Label
//mi.Sort = listGroup[j].Sort
@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
}
return m
}
}