Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-20 a3504dac6e4c5d1ab04bf835be2f7417e6ced576

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java

@@ -22,7 +22,7 @@
     * 主建
     */
    @TableId(value = "oss_config_id")
    private Integer ossConfigId;
    private Long ossConfigId;

    /**
     * 配置key