Merge branch 'developer' into alpha

Helius

2022-03-14 938d37e96dc00f8fc3c7036d818e87d51624e0a9

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