From e0965debdfc7149b9490d66d45c8737ca574ed21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 14:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
index 5b12a06..24d4212 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.admin.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@
     private String companyName;
 
     @ApiModelProperty(value = "浜哄憳绫诲瀷")
-    private Integer type;
+    private String type;
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     private Date startTime;

--
Gitblit v1.9.3