From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/menu/MenuQueryVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/menu/MenuQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/menu/MenuQueryVO.java
index 6c0a1f0..c7930c4 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/menu/MenuQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/menu/MenuQueryVO.java
@@ -24,7 +24,7 @@
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MenuQueryVO {
- List<MenuVO> vos;
+ List<MenuVO> menus;
public static MenuQueryVO convert(MenuQueryDTO dto) {
if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
@@ -43,7 +43,7 @@
return o1.getOrder() - o2.getOrder();
}
});
- vo.setVos(vos);
+ vo.setMenus(vos);
return vo;
}
--
Gitblit v1.8.0