Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 af0ce5be0e5e78bc2a4ffe962af636bc3d14b99e

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

@@ -58,4 +58,9 @@
        return null;
    }

    @Override
    public Integer deleteDistinct() {
        return baseMapper.deleteDistinct();
    }

}