Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 a41bb438506c3c8072062f50279efb6c889699c9

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

@@ -17,7 +17,7 @@
 */
public interface TechnicianMapper extends BaseMapper<Technician> {

    List<TechnicianVO> selectTechnicianListByShopId(Long shopId);
    List<TechnicianVO> selectTechnicianListByShopId(Long shopId, String name);

    TechnicianDetailVO selectTechnicianDetail(Long technicianId);