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

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

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

@@ -49,6 +49,11 @@
    * 价格
    */
   private BigDecimal price;

   /**
    *自购提成
    */
   private BigDecimal selfPrice;
   /**
    *推广提成
    */
@@ -282,4 +287,12 @@
      return id.equals(((ShopSku) obj).getId());
   }

   public BigDecimal getSelfPrice() {
      return selfPrice;
   }

   public void setSelfPrice(BigDecimal selfPrice) {
      this.selfPrice = selfPrice;
   }

}