From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突

---
 cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java
index 431a503..4a0d5cc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java
@@ -1,7 +1,7 @@
 package com.dsh.account.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.account.entity.EvaluateStudent;
-import com.baomidou.mybatisplus.service.IService;
 import com.dsh.account.model.vo.commentDetail.StuCommentsVo;
 
 import java.util.List;
@@ -16,6 +16,8 @@
  */
 public interface EvaluateStudentService extends IService<EvaluateStudent> {
 
+
+
     List<StuCommentsVo> queryStuCommentsList(Integer stuId);
 
 }

--
Gitblit v1.7.1