Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-20 c161f76f78fead2519b8a66ab30d6e7389deead1

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivitiesGroupJoinUser.java

@@ -71,7 +71,7 @@
   /**
    * 用户Id
    */
   private String  userId;
   private Long  userId;
         
   
   /**
@@ -198,11 +198,11 @@
   }


   public String getUserId() {
   public Long getUserId() {
      return userId;
   }

   public void setUserId(String userId) {
   public void setUserId(Long userId) {
      this.userId = userId;
   }