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/entity/EvaluateStudent.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
index 78248aa..6e1ad54 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
@@ -1,12 +1,12 @@
 package com.dsh.account.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

--
Gitblit v1.7.1