Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

 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;