From 7e7a3631bfb1281920aff89206c40d7941ad692a Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:12:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(report):=20=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5-=20=E5=9C=A8=20To?= =?UTF-8?q?cofsSaleoutDetailedDto=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=BA=94=E6=94=B6=E3=80=81=E8=AE=A1=E7=AE=97=E5=85=AC?= =?UTF-8?q?=E5=BC=8F=E3=80=81=E5=B9=B3=E5=8F=B0=E4=BC=98=E6=83=A0=E3=80=81?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BC=98=E6=83=A0=E3=80=81=E8=BE=BE=E4=BA=BA?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E3=80=81=E5=95=86=E5=AE=B6=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E7=AD=89=E5=BA=94=E6=94=B6=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20-=20=E5=9C=A8=20TocofsSaleoutDetailedEntity.xml=20=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/dto/TocofsSaleoutDetailedDto.java | 20 +++++++++++++++++++ .../entity/TocofsSaleoutDetailedEntity.xml | 7 +++++++ 2 files changed, 27 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java index 80e6812b..d211d14c 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java @@ -102,4 +102,24 @@ public class TocofsSaleoutDetailedDto { @ExcelProperty(value = "交易蓝-U8C主键") private String newsystemprimary3; //交易蓝 结束 + + //应收 开始 + @ExcelProperty(value = "计算应收") + private String def7; + + @ExcelProperty(value = "计算公式") + private String def8; + + @ExcelProperty(value = "平台优惠") + private String def9; + + @ExcelProperty(value = "支付优惠") + private String def10; + + @ExcelProperty(value = "达人优惠") + private String def11; + + @ExcelProperty(value = "商家优惠") + private String def12; + //应收 结束 } diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml index 0a9db093..1f3cf702 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml @@ -440,6 +440,13 @@ + + + + + + +