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

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/FyfaManageVo.java

@@ -14,6 +14,9 @@
   @ApiModelProperty(value = "方案名称")
   private String  name;

   @ApiModelProperty(value = "自购返佣%")
   private Double  selfCommission;

   @ApiModelProperty(value = "推广提成%")
   private Double  sealesCommission;