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

yanghui

2022-11-01 b5a2c2a1e19a433d7f56ac7c259817312360c360

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

}