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

peng

4 天以前 dee9f245cd463669dbf707e05a2872d4466cbf9b

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

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


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