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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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

@@ -22,7 +22,7 @@
   /**
    * 用户id
    */
   private String  userId;
   private Long  userId;
         
   
   /**
@@ -84,11 +84,11 @@
   }
      

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