From e057cdcd1132081abd02eae587850349d14fb2f7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 e52aa6d..214b280 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
@@ -65,7 +65,7 @@
 
     @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
     @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")

--
Gitblit v1.9.3