Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java

@@ -24,9 +24,12 @@



    IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("sql") String sql);
    IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    String getQuerySql();

    List<DicItem> getDictType(@Param("type") String physicalexamtype);

    List<Map<String,Object>> getEmpAccessoryNumber(@Param("empId") Long empId);

}