From 48376938fb04165594a51a8847987669cd80fc63 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 28 十二月 2023 14:13:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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..7651f97 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
@@ -48,6 +48,10 @@
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "鍗＄被鍨� 0IC鍗� 1CPU鍗� 2杩滆窛绂诲崱 3M鍗�")
+ @ExcelColumn(name="鍗＄被鍨� 0IC鍗� 1CPU鍗� 2杩滆窛绂诲崱 3M鍗�")
+ private Integer type;
+
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
@@ -83,8 +87,8 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -92,10 +96,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