Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 9627ff6a924f36b06113ee0bdf6173d4d39b1fad

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -298,8 +298,8 @@
    }

    @Override
    public int selectNum(String userType,String userName,List<String> ids) {
        return baseMapper.selectNum(userType,userName,ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead) {
        return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
    }