Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 454ee66716ec76821e78ab1f056f39fca6f29a71

 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);
}