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

li-guang

2021-04-07 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6

 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;