|
|
@@ -227,19 +227,19 @@ public class LiveOrder extends BaseEntity {
|
|
|
private Integer deliveryStatus;
|
|
|
|
|
|
/** 物流结算状态 */
|
|
|
- @Excel(name = "物流结算状态")
|
|
|
+ @Excel(name = "物流支付状态")
|
|
|
private Integer deliveryPayStatus;
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
- @Excel(name = "物流结算状态")
|
|
|
+ @Excel(name = "物流支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
|
private String deliveryPayTime;
|
|
|
|
|
|
/** 物流跟踪状态 */
|
|
|
- @Excel(name = "物流跟踪状态")
|
|
|
+ @Excel(name = "物流跟踪状态", dictType = "store_order_delivery_type")
|
|
|
private String deliveryType;
|
|
|
|
|
|
/** 物流结算金额 */
|
|
|
- @Excel(name = "物流结算金额")
|
|
|
+ @Excel(name = "物流支付金额")
|
|
|
private BigDecimal deliveryPayMoney;
|
|
|
|
|
|
/** 回单导入时间 */
|
|
|
@@ -249,7 +249,7 @@ public class LiveOrder extends BaseEntity {
|
|
|
|
|
|
/** 发货时间 */
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
- @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
+ @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
|
private Date deliverySendTime;
|
|
|
|
|
|
/** 是否可售后 */
|
|
|
@@ -301,11 +301,11 @@ public class LiveOrder extends BaseEntity {
|
|
|
private Integer isEditMoney;
|
|
|
|
|
|
/** 创建时间*/
|
|
|
- @Excel(name = "创建时间")
|
|
|
+ @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
|
private Date createTime;
|
|
|
|
|
|
/** 更新时间*/
|
|
|
- @Excel(name = "更新时间")
|
|
|
+ @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
|
private Date updateTime;
|
|
|
|
|
|
/** 备注*/
|