Merge branch 'score_shop' into api_score_meger

jyy

2021-09-25 4f4fd43c199ff802df896256bc012a7277fdd4a1

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