push

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

@@ -5,7 +5,7 @@ import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/3/12   11:05
+ * 2019/3/12   21:51
  */
 @Entity
 @Table(name = "DETAIL_RECEIPT_LIST", schema = "YINGXIN", catalog = "")
@@ -19,6 +19,7 @@ public class DetailReceiptListEntity {
     private String note;
     private String signGovt;
     private Long receiptId;
+    private Long sex;
 
     @Id
     @Column(name = "ID")
@@ -110,6 +111,16 @@ public class DetailReceiptListEntity {
         this.receiptId = receiptId;
     }
 
+    @Basic
+    @Column(name = "SEX")
+    public Long getSex() {
+        return sex;
+    }
+
+    public void setSex(Long sex) {
+        this.sex = sex;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -123,11 +134,12 @@ public class DetailReceiptListEntity {
                 Objects.equals(cardId, that.cardId) &&
                 Objects.equals(note, that.note) &&
                 Objects.equals(signGovt, that.signGovt) &&
-                Objects.equals(receiptId, that.receiptId);
+                Objects.equals(receiptId, that.receiptId) &&
+                Objects.equals(sex, that.sex);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, note, signGovt, receiptId);
+        return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, note, signGovt, receiptId, sex);
     }
 }

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

@@ -6,7 +6,7 @@ import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/3/10   14:52
+ * 2019/3/12   21:51
  */
 @Entity
 @Table(name = "RECEIPT_LIST", schema = "YINGXIN", catalog = "")
@@ -19,6 +19,8 @@ public class ReceiptListEntity {
     private Time checkDate;
     private String checkName;
     private Long state;
+    private Long cardTypeId;
+    private Long oldCardTypeId;
 
     @Id
     @Column(name = "ID")
@@ -100,6 +102,26 @@ public class ReceiptListEntity {
         this.state = state;
     }
 
+    @Basic
+    @Column(name = "CARD_TYPE_ID")
+    public Long getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(Long cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    @Basic
+    @Column(name = "OLD_CARD_TYPE_ID")
+    public Long getOldCardTypeId() {
+        return oldCardTypeId;
+    }
+
+    public void setOldCardTypeId(Long oldCardTypeId) {
+        this.oldCardTypeId = oldCardTypeId;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -112,11 +134,13 @@ public class ReceiptListEntity {
                 Objects.equals(finishCount, that.finishCount) &&
                 Objects.equals(checkDate, that.checkDate) &&
                 Objects.equals(checkName, that.checkName) &&
-                Objects.equals(state, that.state);
+                Objects.equals(state, that.state) &&
+                Objects.equals(cardTypeId, that.cardTypeId) &&
+                Objects.equals(oldCardTypeId, that.oldCardTypeId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state);
+        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state, cardTypeId, oldCardTypeId);
     }
 }