From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 7f3b755..c1bcb97 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -193,9 +193,12 @@
     @ExcelColumn(name="绛旈璁板綍缂栫爜锛堝叧鑱攗ser_answer)")
     private Integer userAnswerId;
 
-    @ApiModelProperty(value = "娴峰悍鏍囪瘑")
-    @ExcelColumn(name="娴峰悍鏍囪瘑")
+    @ApiModelProperty(value = "娴峰悍璁垮鏍囪瘑")
+    @ExcelColumn(name="娴峰悍璁垮鏍囪瘑")
     private String hkId;
+    @ApiModelProperty(value = "娴峰悍棰勭害鏍囪瘑")
+    @ExcelColumn(name="娴峰悍棰勭害鏍囪瘑")
+    private String hkRecordId;
     @ApiModelProperty(value = "openid")
     @ExcelColumn(name="openid")
     private String openid;
@@ -328,4 +331,16 @@
     @TableField(exist = false)
     private ApproveDataVO approveDateVO;
 
+
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date queryStarttime;
+
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date queryEndtime;
+
+
 }

--
Gitblit v1.9.3