Merge remote-tracking branch 'origin/master'

doum

2 天以前 08300102d46271dd34073465763debd8507e8552

 server/dmmall_service/src/main/java/com/doumee/service/business/AftersaleService.java

@@ -116,5 +116,5 @@

    void autoDone();

    void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest, Integer userId);
    void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest);
}