Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-18 fca00ddabb395a44c99b0a39b47a7cd2955aede0

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixVipDto.java

@@ -7,7 +7,7 @@
@Data
public class SixVipDto {
    private String month;
    private String vipName;
    private String name;
    private Integer vipId;
    private BigDecimal paymentAmount;
}