Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

# Conflicts: # ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
2023-10-18 13:50:38 +08:00
parent 953410c5df e39b2ce087
commit 2d3b08d027
6 changed files with 69 additions and 56 deletions
@@ -1,5 +1,6 @@
 package com.ruoyi.wisdomarbitrate.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;

@@ -41,8 +42,18 @@ public class CaseAffiliate   extends BaseEntity {
    /**
     * 被申请人出生年月日
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date responBirth;

+    public Date getResponBirth() {
+        return responBirth;
+    }
+
+    public void setResponBirth(Date responBirth) {
+        this.responBirth = responBirth;
+    }
+
+
    public String getCompLegalPerson() {
        return compLegalPerson;
    }
@@ -67,13 +78,8 @@ public class CaseAffiliate   extends BaseEntity {
        this.responSex = responSex;
    }

-    public Date getResponBirth() {
-        return responBirth;
-    }

-    public void setResponBirth(Date responBirth) {
-        this.responBirth = responBirth;
-    }
+

    /** 身份证号 */
    @Excel(name = "身份证号")