Merge branch 'master' into electron_dev

zjk

2026-07-24 3ee306e4a8db75680960f5eb4eec9fb7d05b5f29

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/EmployeeMapper.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.Employee;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -8,7 +9,7 @@
import java.util.List;

@Mapper
public interface EmployeeMapper {
public interface EmployeeMapper extends BaseMapper<Employee> {

    /**
     * 按主键查询启用且未删除的接待人。
@@ -19,7 +20,7 @@
    /**
     * 根据员工姓名精准查询启用的员工
     */
    Employee selectEnabledByEmployeeName(@Param("employeeName") String employeeName);
    List<Employee> selectEnabledByEmployeeName(@Param("employeeName") String employeeName);

    List<Employee> selectAllEnabled();
}