From 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 13:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index 2c437fd..f8d889a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -147,6 +148,9 @@
@ExcelColumn(name="璧峰缂栫爜")
private Integer noIndex;
+ @ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
+ private Integer alcoholStatus;
+
@ApiModelProperty(value = "缁忕含搴︿俊鎭� 鍙傛暟鍊硷細缁忓害,绾害")
@TableField(exist = false)
private String jwd;
@@ -163,5 +167,8 @@
@TableField(exist = false)
private List<String> authMemberIdList;
+ @ApiModelProperty(value = "婵�娲绘枃浠�")
+ @TableField(exist = false)
+ private Multifile activateFile;
}
--
Gitblit v1.9.3