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/service/TOptometristService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java b/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
index e653703..a4f857a 100644
--- a/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
+++ b/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
@@ -3,6 +3,8 @@
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TOptometrist;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jilongda.manage.query.TOptometryQuery;
+import com.jilongda.manage.vo.TOptometryVO;
import com.jilongda.manage.query.TOptometristQuery;
import com.jilongda.manage.vo.TOptometristVO;
@@ -16,12 +18,9 @@
*/
public interface TOptometristService extends IService<TOptometrist> {
- Boolean upAndDown(Integer id, Integer status);
+ PageInfo<TOptometryVO> pageList(TOptometryQuery query);
- /**
- * 验光师列表
- * @param query
- * @return
- */
- PageInfo<TOptometristVO> pageList(TOptometristQuery query);
+ PageInfo<TOptometristVO> pageList1(TOptometristQuery query);
+
+ Boolean upAndDown(Integer id, Integer status);
}
--
Gitblit v1.7.1