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/ApiVisitorRecordSinginRequest.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecordSinginRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecordSinginRequest.java
index 6a5f67b..dc27c59 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecordSinginRequest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ApiVisitorRecordSinginRequest.java
@@ -17,8 +17,8 @@
@ApiModel(value = "ApiVisitorRecordSinginRequest", description = "离线模式签到数据")
public class ApiVisitorRecordSinginRequest
{
- @NotBlank(message = "设备编号不能为空")
- @ApiModelProperty(value = "设备编号")
+// @NotBlank(message = "设备编号不能为空")
+ @ApiModelProperty(value = "设备编号,非必填")
private String deviceNo;
/**
@@ -48,6 +48,10 @@
@ApiModelProperty(value = "接待人验证方式")
private String receiverVerifyMethod;
+ @NotBlank(message = "登记类型不能为空")
+ @ApiModelProperty(value = "登记类型：APPOINTMENT预约登记 ONSITE现场登记")
+ private String registerType;
+
/**
* 访问区域ID，英文逗号分隔
*/
@@ -70,21 +74,21 @@
* 有效期开始时间
*/
@ApiModelProperty(value = "有效期开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyyMMddHHmmss")
private Date validStartTime;
/**
* 有效期结束时间
*/
@ApiModelProperty(value = "有效期结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyyMMddHHmmss")
private Date validEndTime;
/**
* 登记时间
*/
@ApiModelProperty(value = "登记时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyyMMddHHmmss")
private Date registerTime;
/**
--
Gitblit v1.7.1