From b3df09b83f6f46bc1db0da689b1b98ad7338f283 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 18:04:23 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 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..4c15d61 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,15 @@
 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -44,7 +45,7 @@
      * 璇佷欢绫诲瀷
      */
     @TableField("certificate_type")
-    private String certificateType;
+    private Integer certificateType;
 
     /**
      * 璇佷欢鍙�
@@ -56,7 +57,7 @@
      * 鏂囧寲绋嬪害
      */
     @TableField("education_degree")
-    private String educationDegree;
+    private Integer educationDegree;
 
     /**
      * 鑱屼笟
@@ -74,7 +75,7 @@
      * 姘戞棌
      */
     @TableField("nation")
-    private String nation;
+    private Integer nation;
 
     /**
      * 绫嶈疮
@@ -105,6 +106,23 @@
      */
     @TableField("create_time")
     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