Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 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;