Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-07 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635

 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();