Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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

@@ -13,8 +13,8 @@
   @ApiModelProperty(hidden = true)
   private Long companyId;
   
   @ApiModelProperty(value ="会员OPENID")
   private String userId;
   @ApiModelProperty(value ="会员ID")
   private Long userId;
   
   @ApiModelProperty(value ="申请记录ID")
    private Long applyId;