解决冲突

mitao

2025-02-24 879ce4e66b36daf44f79b17eb02d3578148e4545

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/MessageNotificationServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +32,7 @@
   @Override
   public Page<MessageNotificationVO> getMessageList(BasePage basePage, Long userId) {
      //TODO 待完善
      Page<MessageNotificationVO> page = new Page<>(basePage.getPageNum(),basePage.getPageSize());
      return page;
      Page<MessageNotification> page = lambdaQuery().page(new Page<>(basePage.getPageNum(),basePage.getPageSize()));
      return (Page<MessageNotificationVO>) page.convert(item-> BeanUtil.copyProperties(item, MessageNotificationVO.class));
   }
}