Merge branch 'ty_fix' into alpha

Helius

2021-11-12 b70d988c7600d179aba0fabb6adf0dc7c461cb8a

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

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

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

    @ApiModelProperty(value ="审核状态   2：同意 3：不同意")
    private Integer applyState;