From d0f665a83a1be237cd675a63ba0cef08bf31aad0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 10:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index c2e2136..41e5093 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -13,7 +13,7 @@
/**
* 浜哄憳鎺堟潈瀵煎叆璁板綍
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳鎺堟潈瀵煎叆璁板綍")
@@ -53,7 +53,7 @@
@ApiModelProperty(value = "棰勭害鏍囪瘑", example = "1")
@ExcelColumn(name="棰勭害鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
@@ -65,11 +65,11 @@
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�")
- private String startTime;
+ private Date startTime;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�")
- private Integer endTime;
+ private Date endTime;
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
@ExcelColumn(name="瀵煎叆鐘舵��")
--
Gitblit v1.9.3