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

疯狂的狮子li

2021-09-01 adb31b71f8c3490b923c8cb6f12b74be6ca3a02d

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

@@ -60,7 +60,7 @@
    private String endpoint;

    /**
     * 是否htpps（0否 1是）
     * 是否https（0否 1是）
     */
    private String isHttps;