From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 十二月 2024 11:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
index 45db413..fb56e03 100644
--- a/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
+++ b/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
@@ -3,6 +3,13 @@
 import com.jilongda.common.basic.PageInfo;
 import com.jilongda.manage.model.TOptometrist;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jilongda.manage.query.TOptometryQuery;
+import com.jilongda.manage.query.TSupplierQuery;
+import com.jilongda.manage.vo.TOptometryVO;
+import com.jilongda.manage.vo.TSupplierVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 import com.jilongda.manage.query.TOptometristQuery;
 import com.jilongda.manage.vo.TOptometristVO;
 import org.apache.ibatis.annotations.Param;
@@ -25,6 +32,7 @@
      * @param pageInfo
      * @return
      */
-    List<TOptometristVO> pageList(@Param("query") TOptometristQuery query, @Param("pageInfo")PageInfo<TOptometristVO> pageInfo);
+    List<TOptometristVO> pageList1(@Param("query") TOptometristQuery query, @Param("pageInfo")PageInfo<TOptometristVO> pageInfo);
+    List<TOptometryVO> pageList(@Param("query") TOptometryQuery query, @Param("pageInfo")PageInfo<TOptometryVO> pageInfo);
 
 }

--
Gitblit v1.7.1