Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-18 00cce6a0395df11d2ab9d654d86dfea14af57d9c

 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;

}