Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

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

@@ -242,4 +242,7 @@

    String createExchangeCode();


    void autoCancelOrder();

}