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

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java

@@ -9,7 +9,7 @@
import lombok.Getter;

/**
 * 云存储服务商枚举
 * 对象存储服务商枚举
 *
 * @author Lion Li
 */