销售、采购列表导出增加收费日期

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjOrderExportExcelCG.java

@@ -96,6 +96,12 @@ public class PjOrderExportExcelCG implements Serializable {
 	private Date businesDate;
 
 	/**
+	 * 收费日期
+	 */
+	@ExcelProperty(value = "收费日期")
+	private Date paymentDate;
+
+	/**
 	 * 创建人名称
 	 */
 	@ExcelProperty(value = "制单人")

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjOrderExportExcelXS.java

@@ -17,25 +17,17 @@
 package org.springblade.salesPart.excel;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.pay.tonglianPayment.entity.WechatMark;
-import org.springblade.salesPart.entity.PjOrderItems;
-import org.springblade.salesPart.entity.PjShip;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 配件销售采购表实体类
@@ -141,6 +133,12 @@ public class PjOrderExportExcelXS implements Serializable {
 	@ExcelProperty(value = "支付状态")
 	private String paymentStatus;
 
+	/**
+	 * 收费日期
+	 */
+	@ExcelProperty(value = "收费日期")
+	private Date paymentDate;
+
 	@ExcelIgnore
 	private Integer actualPaymentStatus;