Merge branch 'developer'

Helius

2022-03-14 f962a9a2e9594d8c21a908c3d3d92fb94af1630f

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

@@ -12,7 +12,7 @@

    @NotNull
   @ApiModelProperty(value ="会员ID")
    private String userId;
    private Long userId;
    
    @ApiModelProperty(value = "申请记录ID")
   private Long applyId;