From c9d5baa887fbbb4abc3b5e63bcf228094ec972ea Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期三, 27 十二月 2023 18:17:44 +0800
Subject: [PATCH] 人员开卡功能

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 86ee196..eb7268b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -92,10 +92,29 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
-    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤")
-    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
+    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤 2閫�鍗� 3鎸傚け")
+    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤 2閫�鍗� 3鎸傚け")
     private Integer status;
 
+    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤 2閫�鍗� 3鎸傚け")
+    @TableField(exist = false)
+    private String statusName;
+
+    @ApiModelProperty(value = "鍗$被鍨� 1 IC鍗� 2 CPU鍗�  3杩滆窛绂诲崱 4M鍗� -- 鍓嶇鏂板浼犲�煎啓姝�")
+    @ExcelColumn(name="鍗$被鍨� 1 IC鍗� 2 CPU鍗�  3杩滆窛绂诲崱 4M鍗�")
+    private Integer cardType;
+
+    @ApiModelProperty(value = "鍗$被鍨嬪悕绉�")
+    @TableField(exist = false)
+    private String cardTypeName;
+
+    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳", example = "1")
+    @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳")
+    private Integer type;
+
+    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳", example = "1")
+    @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳")
+    private String typeName;
 
     @ApiModelProperty(value = "鍏抽敭瀛�")
     @TableField(exist = false)

--
Gitblit v1.9.3