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

peng

6 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

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

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


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