This commit is contained in:
2022-06-20 15:23:24 +08:00
parent e88f309c30
commit 3d5ebf56f1
@@ -753,7 +753,7 @@ public class FjtEvaluation implements SqlEntity{
this.useType = useType;
}
<<<<<<< .mine
@Column(name = "certificate_address")
public String getCertificateAddress() {
return certificateAddress;
@@ -764,8 +764,6 @@ public class FjtEvaluation implements SqlEntity{
}
=======
@Column(name = "down_pdf_date")
public Date getDownPdfDate() {
return downPdfDate;
@@ -775,7 +773,6 @@ public class FjtEvaluation implements SqlEntity{
this.downPdfDate = downPdfDate;
}
>>>>>>> .theirs
@Override
public String toString() {
return "FjtEvaluation{" +