Merge branch 'developer' into alpha

姜友瑶

2022-05-04 9fc4177dd26683f5dc6d8ebb62ab5b230ac21def

 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;