Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-10 d9bcc1f955e1cddc6a38e55f769205a9330d3c89

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

@@ -4,6 +4,7 @@
import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.vo.TechnicianDetailVO;
import com.ruoyi.other.vo.TechnicianVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

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

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

    TechnicianDetailVO selectTechnicianDetail(Long technicianId);