Merge remote-tracking branch 'origin/master'

suishenbang-order/src/main/java/com/dgtly/order/domain/MetaHanaSalesOrder.java

@@ -1,5 +1,6 @@
 package com.dgtly.order.domain;
 
+import com.dgtly.common.annotation.Excel;
 import com.dgtly.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -17,7 +18,7 @@ import java.util.Date;
 public class MetaHanaSalesOrder extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
-
+    @Excel(name = "订单号", cellType = Excel.ColumnType.NUMERIC, prompt = "订单编号")
     private String docNumber;
 
 
@@ -30,9 +31,9 @@ public class MetaHanaSalesOrder extends BaseEntity {
     private String salesOrgName;
 
     private String distributionChannel;
-
+    @Excel(name = "经销商编号")
     private String customerCode;
-
+    @Excel(name = "经销商名称")
     private String customerName;
 
     private String route;
@@ -44,7 +45,7 @@ public class MetaHanaSalesOrder extends BaseEntity {
     private String plant;
 
     private String docType;
-
+    @Excel(name = "订单创建时间")
     private String createDate;
 
     private String createDateItem;
@@ -56,9 +57,9 @@ public class MetaHanaSalesOrder extends BaseEntity {
     private String materialName;
 
     private String sizeDim;
-
+    @Excel(name = "信用通过时间")
     private String creditDate;
-
+    @Excel(name = "信用状态")
     private String creditStatus;
 
     private String rejectReason;
@@ -76,6 +77,7 @@ public class MetaHanaSalesOrder extends BaseEntity {
     private BigDecimal deliverAmt;
 
     /** 创建时间 */
+    @Excel(name = "期望到货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expectedTime;