From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 25 七月 2025 20:13:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java index 99e844c..0b8e3a5 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java @@ -106,14 +106,14 @@ } /** - * @description 统计商户到店人数 - * @author jqs - * @date 2023/6/25 17:17 * @param shopId - * @return Integer + * @return Integer + * @description 统计商户到店人数 + * @author jqs + * @date 2023/6/25 17:17 */ @Override - public Integer countShopServicePerson(Long shopId){ + public List<Integer> countShopServicePerson(Long shopId) { return userServiceRecordMapper.countShopServicePerson(shopId); } } -- Gitblit v1.7.1