Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java

@@ -55,5 +55,13 @@
     */
    MgtMemberServiceTotalVo getMgtMemberServiceTotal(@Param("userId")Long userId);

    /**
     * @description  统计商户到店人数
     * @author  jqs
     * @date    2023/6/25 17:17
     * @param shopId
     * @return  Integer
     */
    Integer countShopServicePerson(@Param("shopId")Long shopId);

}