From 3ee306e4a8db75680960f5eb4eec9fb7d05b5f29 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 24 七月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' into electron_dev
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecodeSingoutRequest.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecodeSingoutRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecodeSingoutRequest.java
index 10bc726..41d90d5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecodeSingoutRequest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecodeSingoutRequest.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,8 +17,8 @@
@ApiModel(value = "ApiVisitorRecodeSingoutRequest", description = "离线上传的访客身份证签离")
public class ApiVisitorRecodeSingoutRequest
{
- @NotBlank(message = "设备编号不能为空")
- @ApiModelProperty(value = "设备编号")
+// @NotBlank(message = "设备编号不能为空")
+ @ApiModelProperty(value = "设备编号,非必填")
private String deviceNo;
/**
@@ -42,8 +43,13 @@
/** 签离时间 */
@ApiModelProperty(value = "签离时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signTime;
+// @NotBlank(message = "登记类型不能为空")
+// @ApiModelProperty(value = "登记类型：APPOINTMENT预约登记 ONSITE现场登记")
+// private String registerType;
+
/** 签离接待人 */
@ApiModelProperty(value = "签离接待人")
private String signReceiverName;
--
Gitblit v1.7.1