From e59a768f56efb64bf2fad412f62eca2a836b652f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 28 十二月 2023 14:13:00 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index c4d307b..79d0248 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.admin.request.OptionsObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 璇曢淇℃伅琛�
@@ -38,7 +40,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -47,7 +49,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,16 +76,19 @@
     @ExcelColumn(name="鎺掑簭鐮�")
     private Integer sortnu;
 
-    @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� ", example = "1")
-    @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� ")
+    @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇", example = "1")
+    @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇")
     private Integer type;
 
     @ApiModelProperty(value = "鍒嗗��", example = "1")
     @ExcelColumn(name="鍒嗗��")
     private BigDecimal score;
 
-    @ApiModelProperty(value = "浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�", example = "1")
-    @ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
+    @ApiModelProperty(value = "浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�", example = "1")
+    @ExcelColumn(name="浣跨敤鍦烘櫙 浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�")
     private Integer useType;
 
+    @ApiModelProperty(value = "閫夐」闆嗗璞¢泦鍚�")
+    @TableField(exist = false)
+    private List<OptionsObject> objectList;
 }

--
Gitblit v1.9.3