Merge remote-tracking branch 'origin/master'

doum

16 小时以前 ae917e09a897843344424ca7d36dd22c216f5f50

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

@@ -108,6 +108,7 @@
     * @return PageData<Goodsorder>
     */
    PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
    PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap);

    List<Goodsorder> exportExcel(Goodsorder goodsorder);