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

}