Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

1 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java

@@ -267,7 +267,7 @@
        String[] headers = {
                "会员名称", "优惠券名称", "发布店铺", "面额/折扣",
                 "获取方式", "会员优惠券状态", "优惠券类型",
                 "使用起始时间", "截止时间"
                 "使用起始时间", "截止时间","领取时间"
        };
        for (int i = 0; i < headers.length; i++) {
            Cell cell = header.createCell(i);
@@ -371,6 +371,12 @@
            } else {
                endTimeCell.setCellValue("");
            }
            Cell claimTimeCell = row.createCell(9);
            if (Objects.nonNull(dto.getClaimTime())) {
                endTimeCell.setCellValue(DateUtil.formatDateTime(dto.getClaimTime()));
            } else {
                claimTimeCell.setCellValue("");
            }
        }

        return workbook;