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/ShopDeliveryInfo.java

@@ -61,7 +61,7 @@
   /**
    * 用户ID
    */
   private String  userId;
   private Long  userId;
         
   
   /**
@@ -196,16 +196,14 @@
      public void setOrderId(Integer orderId) {
      this.orderId=orderId;
   }
   	

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

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

   public String getOrderNo() {
      return orderNo;