Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 736b58a43b0afb40745f885f400ef97d070f46a9

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

@@ -21,7 +21,7 @@
public interface EmpAccessoryMapper extends BaseMapper<EmpAccessory> {


    @Select("${sql}  ${ew.customSqlSegment}")

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

    String getQuerySql();