From 938d37e96dc00f8fc3c7036d818e87d51624e0a9 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Mar 2022 15:34:01 +0800 Subject: [PATCH] Merge branch 'developer' into alpha --- 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