From 9ffa4aac7e3ae6b268dbc3567a0749a9898c3708 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 一月 2024 18:09:09 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 b850f40..323bfb8 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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,16 +41,12 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@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="澶囨敞")
@@ -96,12 +92,33 @@
@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鍗� 0铏氭嫙鍗� -- 鍓嶇鏂板浼犲�煎啓姝�")
+ @ExcelColumn(name="鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗� 0铏氭嫙鍗�")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍗＄被鍨嬪悕绉�")
+ @TableField(exist = false)
+ private String cardTypeName;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @TableField(exist = false)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @TableField(exist = false)
+ private String memberTypeName;
@ApiModelProperty(value = "鍏抽敭瀛�")
@TableField(exist = false)
- private String KeyWords;
+ private String keyword;
}
--
Gitblit v1.9.3