Parcourir la source

1、海康数据推送增加字段
2、留宿申请查询报错问题解决

dzx il y a 2 mois
Parent
commit
c44191a184

+ 3 - 0
src/main/java/com/xjrsoft/module/hikvision/entity/HikvisionData.java

@@ -52,4 +52,7 @@ public class HikvisionData implements Serializable {
     @ApiModelProperty("对应的海康威视系统的id")
     private String hikvisionId;
 
+    @ApiModelProperty("发送数据")
+    private String sendData;
+
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/room/dto/WfRoomStayOvernightPageDto.java

@@ -6,6 +6,7 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -53,6 +54,7 @@ public class WfRoomStayOvernightPageDto extends PageInput {
      */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("开始时间")
     private LocalDate startTime;
     /**
@@ -60,6 +62,7 @@ public class WfRoomStayOvernightPageDto extends PageInput {
      */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("结束时间")
     private LocalDate endTime;
 }