Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -63,4 +63,5 @@
     * @return  Integer
     */
    Integer countShopServicePerson(@Param("shopId")Long shopId);

}