From 3b6e6d6dc6a6743a6b4ca7701dcb2ae1e6e7a26e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 28 五月 2024 09:20:47 +0800
Subject: [PATCH] 解决冲突

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
index 314c084..138fda2 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
@@ -1,12 +1,13 @@
 package com.ruoyi.article.dto;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.page.BasePage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 @Data
-public class ArticleCommentsDTO {
+public class ArticleCommentsDTO extends BasePage {
 
     @ApiModelProperty(value = "资讯评论id")
     @TableId(value = "id", type = IdType.ASSIGN_ID)

--
Gitblit v1.7.1