Merge branch 'lybDevelop'

luoyb

2021-02-18 b230858cc0d2ee4fdb177c91c4e11cdf3dd57364

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java

@@ -90,8 +90,10 @@
                queryWrapper.eq("a.politics", vo.getPolitics());
            }
        }
        queryWrapper.eq("a.delFlag",0);
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
        return empAccessoryMapper.selectPageVo(page, queryWrapper);
        String querySql = empAccessoryMapper.getQuerySql();
        return empAccessoryMapper.selectPageVo(page, queryWrapper,querySql);
    }

    @Override