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

935090232@qq.com

2021-10-25 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1

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

@@ -24,7 +24,7 @@
   /**
    * 用户ID
    */
   private String  userId;
   private Long  userId;
         
   
   /**
@@ -59,11 +59,11 @@
   }
      

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