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

@@ -21,5 +21,7 @@
     */
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId);

    void subscribe(TechnicianSubscribe technicianSubscribe);
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Long userId, Integer status);

    void subscribe(TechnicianSubscribe technicianSubscribe, Long technicianId);
}