Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-20 e40003bf9913748a8f515257a0d2093239636dc7

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

}