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/MemberCard.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 5f04ac6..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
@@ -100,8 +100,8 @@
@TableField(exist = false)
private String statusName;
- @ApiModelProperty(value = "鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗� -- 鍓嶇鏂板浼犲�煎啓姝�")
- @ExcelColumn(name="鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗�")
+ @ApiModelProperty(value = "鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗� 0铏氭嫙鍗� -- 鍓嶇鏂板浼犲�煎啓姝�")
+ @ExcelColumn(name="鍗＄被鍨� 1 IC鍗� 2 CPU鍗� 3杩滆窛绂诲崱 4M鍗� 0铏氭嫙鍗�")
private Integer type;
@ApiModelProperty(value = "鍗＄被鍨嬪悕绉�")
@@ -120,5 +120,5 @@
@ApiModelProperty(value = "鍏抽敭瀛�")
@TableField(exist = false)
- private String KeyWords;
+ private String keyword;
}
--
Gitblit v1.9.3