Merge branch 'ty_fix' into alpha

Helius

2021-11-11 404c2fea96204bc0fc4a6845cb13d1992d728aa4

 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;