Merge remote-tracking branch 'origin/master'

doum

2 天以前 5f277fef6d2c6538e2158ed14bb14d5a60a43912

 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);
}