Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-11 b49b4ec0a5f90ed621ffd9ee2021f98da109cbd0

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/CouponListDto.java

@@ -16,5 +16,7 @@
    private Long userId;
    @ApiModelProperty("预付价格")
    private BigDecimal payMoney;
    @ApiModelProperty("桩编号")
    private Integer number;

}