From 68c92dc86cc15ca8d4982a73e7404bd479f2232c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 22 十一月 2022 17:20:28 +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/Investigation.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
index 65faeff..1fb4384 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
@@ -11,6 +11,7 @@
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -30,14 +31,14 @@
 
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
 
     /**
      * 妗堜欢id
      */
     @TableField("base_case_id")
     @ApiModelProperty(value = "妗堜欢id")
-    private Integer baseCaseId;
+    private Long baseCaseId;
 
     /**
      * 鎵垮姙闃熷憳
@@ -79,7 +80,7 @@
      */
     @TableField("party_id")
     @ApiModelProperty(value = "褰撲簨浜篿d")
-    private Integer partyId;
+    private Long partyId;
 
     /**
      * 鎯呭喌鎻忚堪
@@ -100,7 +101,7 @@
      */
     @TableField("create_user")
     @ApiModelProperty(value = "鍒涘缓浜�")
-    private Integer createUser;
+    private Long createUser;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -109,5 +110,12 @@
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
+    /**
+     *  褰撲簨浜轰俊鎭�
+     */
+    @TableField(value = "partyInfo",exist = false)
+    @ApiModelProperty(value = "褰撲簨浜轰俊鎭�")
+    private PartyInfo partyInfo;
+
 
 }

--
Gitblit v1.8.0