From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/PageVO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/PageVO.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/PageVO.java
index b361214..54ecc56 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/PageVO.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/PageVO.java
@@ -11,6 +11,12 @@
@ApiModel("系统设置VO")
@Data
public class PageVO {
- @ApiModelProperty("页面")
- private List<TPage> list;
+ @ApiModelProperty("学习")
+ private String page1;
+ @ApiModelProperty("家长手机")
+ private String page2;
+ @ApiModelProperty("家长平板")
+ private String page3;
+ @ApiModelProperty("注意事项")
+ private String page4;
}
--
Gitblit v1.7.1