Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 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;

}