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

zxl

3 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

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


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