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

peng

8 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

 framework/src/main/java/cn/lili/cos/CosSTS.java

@@ -36,5 +36,6 @@
    @ApiModelProperty("region")
    private String region;


    @ApiModelProperty("端点，用于拼接filekey直接预览")
    private String endpoint;
}