Merge remote-tracking branch 'origin/satoken' into dev

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

 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