Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-15 c41016b0aba1a3ebbf494669570c3a9c2c74d759

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

}