Merge remote-tracking branch 'origin/2.24-blue' into 2.24-blue

zj

2026-03-05 6d8a950aa7769b1d26fb86f7453ab450d19096ec

 trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java

@@ -45,7 +45,7 @@


    @ApiModelProperty("中签时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
    private Date endTime;

    @ApiModelProperty("备注")