Merge remote-tracking branch 'origin/master'

rk

19 小时以前 086be7eae50e48ad554fd8a3f4cb1e333d587595

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