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/ArrivalSituation.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
index 703c611..62854a0 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
@@ -1,14 +1,17 @@
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.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -21,59 +24,70 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_arrival_situation")
+@ApiModel(value = "鍒拌揪鐜板満鎯呭喌")
public class ArrivalSituation implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @ApiModelProperty(value = "id")
+ private Long id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
- private Integer baseCaseId;
+ @ApiModelProperty(value = "妗堜欢id")
+ private Long baseCaseId;
/**
* 鍒拌揪鏃堕棿
*/
@TableField("arrival_time")
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿")
+ @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime arrivalTime;
/**
* 鍒拌揪鍦板潃
*/
@TableField("arrival_address")
+ @ApiModelProperty(value = "鍒拌揪鍦板潃")
private String arrivalAddress;
/**
* 鐜板満鎯呭喌璇存槑
*/
@TableField("situation_explain")
+ @ApiModelProperty(value = "鐜板満鎯呭喌璇存槑")
private String situationExplain;
/**
* 淇¤鍥炲璇存槑
*/
@TableField("reply_explain")
+ @ApiModelProperty(value = "淇¤鍥炲璇存槑")
private String replyExplain;
/**
* 鐜板満鎯呭喌鐓х墖
*/
@TableField("situation_pic")
+ @ApiModelProperty(value = "鐜板満鎯呭喌鐓х墖")
private String situationPic;
/**
* 鍒涘缓浜�
*/
@TableField("create_user")
- private Integer createUser;
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.8.0