Merge branch 'xgg-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-deliver

2a8a751c · 王昆 · 014f8eb1 · f30d941f · 2a8a751c
Commit 2a8a751c authored Jan 11, 2020 by 王昆
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

xgg-deliver/app/front/entry/public/apidoc/order/order.md
+1 -2

No files found.
--- a/xgg-deliver/app/front/entry/public/apidoc/order/order.md
+++ b/xgg-deliver/app/front/entry/public/apidoc/order/order.md
@@ -55,7 +55,7 @@
 [返回到目录](#menu)
 ##### URL
 [/web/order/orderCtl/allOrders]
->>>>>>> f0491f0650119e1bb6786a9cb7dd588ba5c04e24
+
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`

@@ -69,7 +69,6 @@
        "createdBegin": "",             // 创建时间 开始
        "createdEnd": ""                // 创建时间 结束
    }
-<<<<<<< HEAD

    按钮展示规则