浏览代码

Merge branch 'eta/1.0.4' into debug

hsun 1 年之前
父节点
当前提交
de46bde8d5
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      controllers/eta_business/eta_business_menu.go
  2. 1 0
      models/eta_business/eta_business_menu.go

+ 1 - 0
controllers/eta_business/eta_business_menu.go

@@ -131,6 +131,7 @@ func (this *EtaBusinessMenuController) List() {
 			Hidden:     v.Hidden,
 			Hidden:     v.Hidden,
 			MenuType:   v.MenuType,
 			MenuType:   v.MenuType,
 			ButtonCode: v.ButtonCode,
 			ButtonCode: v.ButtonCode,
+			CreateTime: v.CreateTime.Format(utils.FormatDateTime),
 			Children:   make([]*eta_business.EtaBusinessMenuItem, 0),
 			Children:   make([]*eta_business.EtaBusinessMenuItem, 0),
 		}
 		}
 		items = append(items, t)
 		items = append(items, t)

+ 1 - 0
models/eta_business/eta_business_menu.go

@@ -181,6 +181,7 @@ type EtaBusinessMenuItem struct {
 	Level        int                    `description:"菜单等级:1-2-3"`
 	Level        int                    `description:"菜单等级:1-2-3"`
 	MenuType     int                    `description:"菜单类型: 0-菜单; 1-按钮; 2-字段(需要特殊处理)"`
 	MenuType     int                    `description:"菜单类型: 0-菜单; 1-按钮; 2-字段(需要特殊处理)"`
 	ButtonCode   string                 `description:"按钮/菜单唯一标识"`
 	ButtonCode   string                 `description:"按钮/菜单唯一标识"`
+	CreateTime   string                 `description:"创建时间"`
 	Children     []*EtaBusinessMenuItem `description:"子菜单"`
 	Children     []*EtaBusinessMenuItem `description:"子菜单"`
 }
 }