From 5f49840dcf78085b888cab90f61b1efd68c54d4d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 18:41:10 +0800
Subject: [PATCH] fix
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
index 7dcc56c..3ffbf8c 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
@@ -1,10 +1,12 @@
package com.xzx.gc.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
import javax.persistence.Table;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -37,5 +39,15 @@
public static final Integer STATUS_EVALUATE = 5;
public static final Integer STATUS_CANCEL = 6;
+ /**
+ * 后台确认提货 1：是 2：否
+ */
+ private Integer isFinish;
+ public static final Integer ISFINISH_YES = 1;
+ public static final Integer ISFINISH_NO = 2;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date isFinishTime;
+
private String remark;
}
--
Gitblit v1.9.1