Merge branch 'master' into xin

xin

7 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-tools/src/main/java/com/oying/domain/dto/BucketStorageQueryCriteria.java

@@ -21,5 +21,8 @@
    @ApiModelProperty(value = "模糊查询")
    private String blurry;

    @ApiModelProperty(value = "文件类型")
    private String type;

    private List<Timestamp> createTime;
}