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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

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