Merge branch 'developer' into alpha

Helius

2022-05-17 b6dd42b974a9a2fafc511acb2df3446c52fda200

 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;