Merge branch 'score_shop' into api_score_meger

jyy

2021-06-09 050a6e05bf85df074d24e9f5e06cc0d618019ccc

 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java

@@ -12,5 +12,11 @@
   
   @ApiModelProperty(hidden = true)
   private Long companyId;
	
   @ApiModelProperty(value ="会员ID")
   private Long userId;
	
   @ApiModelProperty(value ="申请记录ID")
    private Long applyId;

}