From 08876fcceddfeacdaed1acaacc84b57b7106acf4 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 22 Oct 2025 20:51:40 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=AF=BC=E5=87=BA=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java | 2 +- xkt/src/main/resources/mapper/StoreSaleMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java index d94764631..346572223 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java @@ -24,7 +24,7 @@ public class StoreSaleDownloadDTO { @Excel(name = "客户") private String storeCusName; @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm") - private Date voucherDate; + private Date createTime; @Excel(name = "销售总额") private BigDecimal amount; @Excel(name = "销售数量") diff --git a/xkt/src/main/resources/mapper/StoreSaleMapper.xml b/xkt/src/main/resources/mapper/StoreSaleMapper.xml index 21d8391cc..d7616c31f 100644 --- a/xkt/src/main/resources/mapper/StoreSaleMapper.xml +++ b/xkt/src/main/resources/mapper/StoreSaleMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ROW_NUMBER() OVER ( ORDER BY ss.voucher_date DESC ) AS orderNum, ss.`code`, sc.cus_name AS storeCusName, - ss.voucher_date, + ss.create_time, ss.amount, CONCAT(IFNULL( ss.sale_quantity, 0 ),'/', CASE WHEN IFNULL( ss.refund_quantity, 0 ) > 0 THEN '-' ELSE '' END, IFNULL( ss.refund_quantity, 0 )) AS quantity, IFNULL( ss.round_off, 0 ) AS round_off,