登记妥投失败信息：“查询登记妥投失败信息”的删除，仓库确认后 妥投失败信息不能删除。删除操作不能直接删除，在提示框中二次确认删除操作

src/main/java/com/yxproject/start/entity/DeliveredFailedInfoEntity.java

 package com.yxproject.start.entity;
 
 import javax.persistence.*;
-import java.sql.Time;
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/4/17   9:42
+ * 2019/6/26   10:19
  */
 @Entity
 @Table(name = "DELIVERED_FAILED_INFO", schema = "YINGXIN", catalog = "")
 public class DeliveredFailedInfoEntity {
     private long id;
     private String waybillNumber;
-    private Time backDate;
+    private Date backDate;
     private long backReason;
     private String note;
     private String registerName;
     private String cardId;
+    private Date receiveDate;
+    private String receiveName;
 
     @Id
     @Column(name = "ID")
@@ -41,11 +43,11 @@ public class DeliveredFailedInfoEntity {
 
     @Basic
     @Column(name = "BACK_DATE")
-    public Time getBackDate() {
+    public Date getBackDate() {
         return backDate;
     }
 
-    public void setBackDate(Time backDate) {
+    public void setBackDate(Date backDate) {
         this.backDate = backDate;
     }
 
@@ -69,15 +71,6 @@ public class DeliveredFailedInfoEntity {
         this.registerName = registerName;
     }
 
-    @Basic
-    @Column(name = "BACK_REASON")
-    public long getBackReason() {
-        return backReason;
-    }
-
-    public void setBackReason(long backReason) {
-        this.backReason = backReason;
-    }
     @Basic
     @Column(name = "CARD_ID")
     public String getCardId() {
@@ -88,6 +81,35 @@ public class DeliveredFailedInfoEntity {
         this.cardId = cardId;
     }
 
+    @Basic
+    @Column(name = "RECEIVE_DATE")
+    public Date getReceiveDate() {
+        return receiveDate;
+    }
+
+    public void setReceiveDate(Date receiveDate) {
+        this.receiveDate = receiveDate;
+    }
+
+    @Basic
+    @Column(name = "RECEIVE_NAME")
+    public String getReceiveName() {
+        return receiveName;
+    }
+
+    public void setReceiveName(String receiveName) {
+        this.receiveName = receiveName;
+    }
+    @Basic
+    @Column(name = "BACK_REASON")
+    public long getBackReason() {
+        return backReason;
+    }
+
+    public void setBackReason(long backReason) {
+        this.backReason = backReason;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -97,13 +119,15 @@ public class DeliveredFailedInfoEntity {
                 Objects.equals(waybillNumber, that.waybillNumber) &&
                 Objects.equals(backDate, that.backDate) &&
                 Objects.equals(note, that.note) &&
-                Objects.equals(backReason, that.backReason) &&
+                Objects.equals(registerName, that.registerName) &&
                 Objects.equals(cardId, that.cardId) &&
-                Objects.equals(registerName, that.registerName);
+                Objects.equals(receiveDate, that.receiveDate) &&
+                Objects.equals(backReason, that.backReason) &&
+                Objects.equals(receiveName, that.receiveName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, cardId,backReason,waybillNumber, backDate, note, registerName);
+        return Objects.hash(id, waybillNumber, backDate, backReason,note, registerName, cardId, receiveDate, receiveName);
     }
 }