From be40f9a0f85d6c4027e5ca61c53cd491b5b095e6 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 16 十月 2024 19:21:16 +0800 Subject: [PATCH] 合并代码 --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/ListInfoCouponDto.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/ListInfoCouponDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/ListInfoCouponDto.java index 6536aa8..65b3bc1 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/ListInfoCouponDto.java +++ b/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; + } -- Gitblit v1.7.1