diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
new file mode 100644
index 00000000..bbd1f444
--- /dev/null
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('订单列表')"/>
+    <th:block th:include="include :: layout-latest-css"/>
+    <th:block th:include="include :: ztree-css"/>
+</head>
+<body class="gray-bg">
+
+<div class="ui-layout-center">
+    <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="order-form">
+                    <input type="hidden" id="deptId" name="deptId">
+                    <input type="hidden" id="parentId" name="parentId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                订单号：<input type="text" name="code"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                        class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                        class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()"
+                   shiro:hasPermission="order:order:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: layout-latest-js"/>
+<th:block th:include="include :: ztree-js"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('order:order:edit')}]];
+    var prefix = ctx + "order/master";
+
+    $(function () {
+        var panehHidden = false;
+        if ($(this).width() < 769) {
+            panehHidden = true;
+        }
+        $('body').layout({initClosed: panehHidden, west__size: 185});
+        // 回到顶部绑定
+        if ($.fn.toTop !== undefined) {
+            var opt = {
+                win: $('.ui-layout-center'),
+                doc: $('.ui-layout-center')
+            };
+            $('#scroll-up').toTop(opt);
+        }
+        queryOrderList();
+    });
+
+    function queryOrderList() {
+        var options = {
+            url: prefix + "/list",
+            exportUrl: prefix + "/export",
+            sortName: "createTime",
+            sortOrder: "desc",
+            modalName: "订单",
+            columns: [
+                {
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '订单ID',
+                    visible: false
+                },
+                {
+                    field: 'code',
+                    title: '订单号'
+                },
+                {
+                    field: 'customerId',
+                    title: '消费者ID'
+                },
+                {
+                    field: 'orderType',
+                    title: '订单类型'
+                },
+                {
+                    field: 'orderStatus',
+                    title: '订单状态'
+                },
+                {
+                    field: 'payType',
+                    title: '付款类型'
+                },
+                {
+                    field: 'payStatus',
+                    title: '付款状态'
+                },
+                {
+                    field: 'payTime',
+                    title: '付款时间'
+                },
+                {
+                    field: 'workerId',
+                    title: '接单师傅ID'
+                },
+                {
+                    field: 'revTime',
+                    title: '接单时间'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    sortable: true
+                }
+                ]
+        };
+        $.table.init(options);
+    }
+
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index c610666c..ec42076e 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -37,7 +37,7 @@ public class OrderMaster extends BaseEntity {
     @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
     private Integer workerId;
 
-    @Excel(name = "付款时间间", cellType = Excel.ColumnType.STRING)
+    @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING)
     private String payTime;
 
     @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
