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

疯狂的狮子li

2021-10-11 741a5b275ba3d1a9099d2c5dce94e7a192db66c1

 ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java

@@ -7,13 +7,13 @@
import lombok.EqualsAndHashCode;

/**
 * OSS云存储分页查询对象 sys_oss
 * OSS对象存储分页查询对象 sys_oss
 *
 * @author Lion Li
 */
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("OSS云存储分页查询对象")
@ApiModel("OSS对象存储分页查询对象")
public class SysOssBo extends BaseEntity {

   /**