Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-20 c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9

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