From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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/DispatchInfo.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index eca2dbf..bc3a179 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -33,14 +33,13 @@
      */
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
-
+    private Long id;
     /**
-     * 澶勭疆娴佺▼璁板綍Id
+     * 妗堜欢id(鍚寀ms_base_case琛╥d)
      */
-    @TableField("dispose_record_id")
-    @ApiModelProperty(value = "澶勭疆娴佺▼璁板綍Id")
-    private Integer disposeRecordId;
+    @TableField("base_case_id")
+    @ApiModelProperty(value = "妗堜欢id(鍚寀ms_base_case琛╥d)")
+    private Long baseCaseId;
     /**
      * 鎵ф硶浜哄憳
      */
@@ -58,7 +57,7 @@
      */
     @TableField("enforcement_car")
     @ApiModelProperty(value = "鎵ф硶杞�")
-    private Integer enforcementCar;
+    private Long enforcementCar;
     /**
      * 鎵ф硶闃熶紞
      */
@@ -78,10 +77,10 @@
     @ApiModelProperty(value = "璺濈")
     private Integer distance;
     /**
-     * 澶勭疆鏃ユ湡
+     * 璋冨害闄愭椂
      */
     @TableField("dispose_date")
-    @ApiModelProperty(value = "澶勭疆鏃ユ湡")
+    @ApiModelProperty(value = "璋冨害闄愭椂")
     private Date disposeDate;
     /**
      * 娲鹃仯鎰忚
@@ -94,7 +93,7 @@
      */
     @TableField("create_user")
     @ApiModelProperty(value = "鍒涘缓浜�")
-    private Integer createUser;
+    private Long createUser;
     /**
      * 鍒涘缓鏃堕棿
      */
@@ -102,4 +101,17 @@
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
 
+    /**
+     * 娲鹃仯浜哄鍚�
+     */
+    @ApiModelProperty(value = "娲鹃仯浜哄鍚�")
+    @TableField(value = "create_user_text",exist = false)
+    private String createUserText;
+    /**
+     * 鎵ф硶杞�-杞︾墝鍙�
+     */
+    @TableField(value = "enforcement_car_text",exist = false)
+    @ApiModelProperty(value = "娉曡溅-杞︾墝鍙�")
+    private String enforcementCarText;
+
 }

--
Gitblit v1.8.0