Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 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;
   }