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

疯狂的狮子li

2021-09-03 f566c39026d0141b2b7516b12b3bae90cc16cd13

 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;