Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4

 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;