Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-02 c67297af61ab9d897adae96f7e199c72c16d764b

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java

@@ -20,7 +20,8 @@
     * 查询用于指定门店的相关预约记录
     */
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId);

    List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Long userId, Integer status);

    void subscribe(TechnicianSubscribe technicianSubscribe);
    void subscribe(TechnicianSubscribe technicianSubscribe, Long technicianId);
}