From 807dc1fff85979874fbfc185918025e6b922ee3c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 17:58:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java |   54 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
index 75b9592..fc845e3 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
@@ -1,14 +1,16 @@
 package com.ycl.entity.caseHandler;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -26,85 +28,117 @@
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @ApiModelProperty(value = "id")
+    private Long id;
 
     /**
      * 濮撳悕
      */
     @TableField("name")
+    @ApiModelProperty(value = "濮撳悕")
     private String name;
 
     /**
      * 鎵嬫満鍙�
      */
     @TableField("phone_code")
+    @ApiModelProperty(value = "鎵嬫満鍙�")
     private String phoneCode;
 
     /**
      * 璇佷欢绫诲瀷
      */
     @TableField("certificate_type")
-    private String certificateType;
+    @ApiModelProperty(value = "璇佷欢绫诲瀷")
+    private Integer certificateType;
 
     /**
      * 璇佷欢鍙�
      */
     @TableField("certificate_code")
+    @ApiModelProperty(value = "璇佷欢鍙�")
     private String certificateCode;
 
     /**
      * 鏂囧寲绋嬪害
      */
     @TableField("education_degree")
-    private String educationDegree;
+    @ApiModelProperty(value = "鏂囧寲绋嬪害")
+    private Integer educationDegree;
 
     /**
      * 鑱屼笟
      */
     @TableField("career")
+    @ApiModelProperty(value = "鑱屼笟")
     private String career;
 
     /**
      * 宸ヤ綔鍗曚綅鍙婅亴鍔�
      */
     @TableField("work")
+    @ApiModelProperty(value = "宸ヤ綔鍗曚綅鍙婅亴鍔�")
     private String work;
 
     /**
      * 姘戞棌
      */
     @TableField("nation")
-    private String nation;
+    @ApiModelProperty(value = "姘戞棌")
+    private Integer nation;
 
     /**
      * 绫嶈疮
      */
     @TableField("native_place")
+    @ApiModelProperty(value = "绫嶈疮")
     private String nativePlace;
 
     /**
      * 鐜颁綇鍦板潃
      */
     @TableField("live_address")
+    @ApiModelProperty(value = "鐜颁綇鍦板潃")
     private String liveAddress;
 
     /**
      * 鎴风睄鎵�鍦ㄥ湴
      */
     @TableField("register_address")
+    @ApiModelProperty(value = "鎴风睄鎵�鍦ㄥ湴")
     private String registerAddress;
 
     /**
      * 鍒涘缓浜�
      */
     @TableField("create_user")
+    @ApiModelProperty(value = "鍒涘缓浜�")
     private Integer createUser;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @TableField("create_time")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
+    /**
+     * 璇佷欢绫诲瀷鏂囨湰
+     */
+    @TableField(value = "certificate_type_text",exist = false)
+    @ApiModelProperty(value = "璇佷欢绫诲瀷鏂囨湰")
+    private String certificateTypeText;
 
-
+    /**
+     * 鏂囧寲绋嬪害鏂囨湰
+     */
+    @TableField(value = "education_degree_text",exist = false)
+    @ApiModelProperty(value = "鏂囧寲绋嬪害鏂囨湰")
+    private String educationDegreeText;
+    /**
+     * 姘戞棌鏂囨湰
+     */
+    @ApiModelProperty(value = "姘戞棌鏂囨湰")
+    @TableField(value = "nation_text",exist = false)
+    private String nationText;
 }

--
Gitblit v1.8.0