From 206aa4bf5fd44e9b31d7284d6be8dc60b90a73ae Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期二, 22 二月 2022 18:12:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java index 38b727b..8e3c35c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java @@ -1,12 +1,12 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.panzhihua.common.model.dtos.community.reserve.*; -import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; +import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve; +import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO; import com.panzhihua.service_community.model.dos.ComActReserveDO; /** @@ -76,7 +76,7 @@ * @param reserveId 预约登记id * @return 预约登记详情 */ - R detailReserveAdmin(Long reserveId); + R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId); /** * 社区后台-根据社区id统计预约类数据 -- Gitblit v1.7.1