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

jyy

2021-04-12 785994b056124cea63120ba6b592a0d277f70075

 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;