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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

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

@@ -129,6 +129,7 @@

   private Long shopId;
   private Long companyId;
   private Long receiveId;
   public Long getCompanyId() {
      return companyId;
   }
@@ -302,4 +303,12 @@
   public void setShopId(Long shopId) {
      this.shopId = shopId;
   }

   public Long getReceiveId() {
      return receiveId;
   }

   public void setReceiveId(Long receiveId) {
      this.receiveId = receiveId;
   }
}