From 92f94b0a4e65b0ab5c4195e632b5e4d1b0158aac Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 28 二月 2024 12:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index 5eff5cf..dd2046a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +18,7 @@
*/
@Data
@ApiModel("闂ㄧ瑙掕壊淇℃伅琛�")
-@TableName("`door_role`")
+@TableName("`device_role`")
public class DeviceRole {
@TableId(type = IdType.AUTO)
@@ -55,8 +56,8 @@
@ExcelColumn(name="鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏄惁榛樿 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁榛樿 0鍚� 1鏄�")
+ @ApiModelProperty(value = "鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�", example = "1")
+ @ExcelColumn(name="鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�")
private Integer isDefault;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@@ -83,4 +84,22 @@
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ExcelColumn(name="娴峰悍鏍囪瘑")
+ private String hkId;
+
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ private Integer hkStatus;
+
+ @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date hkDate;
+
+ @ApiModelProperty(value = "浣跨敤浜烘暟")
+ @ExcelColumn(name="浣跨敤浜烘暟")
+ @TableField(exist = false)
+ private Integer memberNum;
+
}
--
Gitblit v1.9.3