From 89a874ad57ff876070bd9a032cd9113facadb758 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 15:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 2a76f72..569d570 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -14,7 +14,7 @@
/**
* 璁惧淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璁惧淇℃伅琛�")
@@ -52,13 +52,13 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "棰樼洰")
- @ExcelColumn(name="棰樼洰")
- private String title;
+ @ApiModelProperty(value = "璁惧埆鍚�")
+ @ExcelColumn(name="璁惧埆鍚�")
+ private String name;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -79,7 +79,7 @@
@ApiModelProperty(value = "璧勬簮绫诲瀷", example = "1")
@ExcelColumn(name="璧勬簮绫诲瀷")
- private BigDecimal resourceType;
+ private String resourceType;
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
--
Gitblit v1.9.3