From db7f0be6a4f8d3e76ddd726fd2f3648d0e0a2e6e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 28 七月 2025 20:06:43 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java
index b396354..e56b15a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java
@@ -1,11 +1,11 @@
package com.ruoyi.order.mapper.order;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.domain.dto.AppConsumerPageDto;
import com.ruoyi.order.domain.dto.MerServiceRecordPageDto;
import com.ruoyi.order.domain.dto.MgtMemberServiceRecordPageDto;
import com.ruoyi.order.domain.pojo.order.UserServiceRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
@@ -56,12 +56,12 @@
MgtMemberServiceTotalVo getMgtMemberServiceTotal(@Param("userId")Long userId);
/**
- * @description 统计商户到店人数
- * @author jqs
- * @date 2023/6/25 17:17
* @param shopId
- * @return Integer
+ * @return Integer
+ * @description 统计商户到店人数
+ * @author jqs
+ * @date 2023/6/25 17:17
*/
- Integer countShopServicePerson(@Param("shopId")Long shopId);
+ List<Integer> countShopServicePerson(@Param("shopId") Long shopId);
}
--
Gitblit v1.7.1