Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-25 819e873f7e5141f2bcb6979fb6637864b950da5b

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

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

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