From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/mapper/MeetMapper.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
index 74ae5f6..d074aa8 100644
--- a/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
@@ -1,12 +1,10 @@
 package com.ycl.jxkg.mapper;
 
-import com.ycl.jxkg.domain.entity.Meet;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.domain.entity.Meet;
 import com.ycl.jxkg.domain.query.MeetQuery;
 import com.ycl.jxkg.domain.vo.MeetVO;
-import com.ycl.jxkg.domain.form.MeetForm;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +22,7 @@
      * @param id
      * @return
      */
-    MeetVO getById(Integer id);
+    Meet getById(Integer id);
 
     /**
     *  鍒嗛〉

--
Gitblit v1.8.0