Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24

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

@@ -45,7 +45,7 @@
   /**
    * 用户主键
    */
   private String  userId;
   private Long  userId;
         
   
   /**
@@ -102,11 +102,11 @@
      this.actId=actId;
   }

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

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