Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

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

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

    void autoDone();

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

}