Merge remote-tracking branch 'origin/master'

xuhy

2025-01-14 f6b20962bb0453683e9366a3f87b7ec9bfaed03c

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java

@@ -27,7 +27,8 @@
     */
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(PageInfo<TechnicianSubscribeVO> pageInfo,
                                                                    @Param("shopId") Long shopId,
                                                                    @Param("status") Integer status);
                                                                    @Param("status") Integer status,
                                                                    @Param("technicianId") Integer technicianId);
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(PageInfo<TechnicianSubscribeVO> pageInfo,
                                                                    @Param("shopId") Long shopId,
                                                                     @Param("status") Integer status, @Param("phone")String phone,