From 918bfb7afa967b575a57f5880d492534c6e7de4f Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 23 Jun 2021 18:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoin.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoin.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoin.java
index bbaeb9f..071cf97 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoin.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoin.java
@@ -81,7 +81,7 @@
 	/**
 	 * 团长ID
 	 */
-	private String  gjHeadId;
+	private Long  gjHeadId;
 
 	private String headName;
 
@@ -200,11 +200,11 @@
 		this.gjStatus=gjStatus;
 	}
 
-	public String getGjHeadId() {
+	public Long getGjHeadId() {
 		return gjHeadId;
 	}
 
-	public void setGjHeadId(String gjHeadId) {
+	public void setGjHeadId(Long gjHeadId) {
 		this.gjHeadId = gjHeadId;
 	}
 

--
Gitblit v1.9.1