Merge branch 'score_shop' into api_score_meger

Helius

2021-11-30 63a3c4db205ffd06325cfc6a6bebcf7d62eba65e

 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;