Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-22 b6442b4640fd94b812419263b03c9ce5e2371c9a

 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