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

jyy

2021-03-16 67e2e142e752b724e021f3562c7f28e128e6f118

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

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

}