From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' 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