Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-31 fd35f223b7f40ee9ee4a9307384b54a96d7956a2

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

@@ -12,7 +12,9 @@

@Data
public class ListInfoCouponDto {
    List<InfoCouponDto> infoCouponDtoList1;
    List<InfoCouponDto> infoCouponDtoList2;
    List<InfoCouponDto> infoCouponDtoList;
    Integer num1;
    Integer num2;


}