Merge branch 'bug/5687'

models/data_manage/edb_classify.go

@@ -258,6 +258,7 @@ type EdbClassifyItems struct {
 type EdbClassifyIdItems struct {
 	ClassifyId       int `description:"分类id"`
 	ClassifyName     string
+	ClassifyNameEn   string
 	UniqueCode       string `description:"唯一编码"`
 	ParentId         int    `description:"父级分类id"`
 	Level            int    `description:"层级"`

services/data/edb_classify.go

@@ -85,7 +85,7 @@ func GetFullClassifyByClassifyId(targetClassifyId int) (targetList []*data_manag
 		targetItem.UniqueCode = targetClassify.UniqueCode
 		targetItem.Level = targetClassify.Level
 		targetItem.ClassifyName = targetClassify.ClassifyName
-		targetItem.ClassifyName = targetClassify.ClassifyName
+		targetItem.ClassifyNameEn = targetClassify.ClassifyNameEn
 		targetItem.IsJoinPermission = targetClassify.IsJoinPermission
 		targetList = append(targetList, targetItem)
 		return
@@ -118,6 +118,7 @@ func GetFullClassifyByClassifyId(targetClassifyId int) (targetList []*data_manag
 				targetItem.UniqueCode = v.UniqueCode
 				targetItem.Level = v.Level
 				targetItem.ClassifyName = v.ClassifyName
+				targetItem.ClassifyNameEn = v.ClassifyNameEn
 				targetItem.IsJoinPermission = v.IsJoinPermission
 				targetList = append(targetList, targetItem)
 			}