Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-09 279df6a13a6889020d27e391069879887142b755

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java

@@ -53,8 +53,8 @@
    }

    @Override
    public List<Map<String, Object>> selectRoles(String condition) {
        return this.baseMapper.selectRoles(condition);
    public List<Map<String, Object>> selectRoles(String condition,String headName,String headPhone) {
        return this.baseMapper.selectRoles(condition,headName,headPhone);
    }

    @Override