diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml
index 27f3e6b7..2c11721c 100644
--- a/ghy-admin/src/main/resources/application.yaml
+++ b/ghy-admin/src/main/resources/application.yaml
@@ -30,7 +30,7 @@ server:
       max: 800
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
- 
+
 # 日志配置
 logging:
   level:
@@ -58,7 +58,7 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
+  profiles:
     active: druid
   # 文件上传
   servlet:
@@ -83,10 +83,10 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Shiro
 shiro:
@@ -103,7 +103,7 @@ shiro:
     captchaType: math
   cookie:
     # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
+    domain:
     # 设置cookie的有效访问路径
     path: /
     # 设置HttpOnly属性
@@ -111,7 +111,7 @@ shiro:
     # 设置Cookie的过期时间，天为单位
     maxAge: 30
     # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）Base64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) （默认启动生成随机秘钥，随机秘钥会导致之前客户端RememberMe Cookie无效，如设置固定秘钥RememberMe Cookie则有效）
-    cipherKey: 
+    cipherKey:
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
     expireTime: 30
@@ -128,7 +128,7 @@ shiro:
     enabled: true
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
diff --git a/ghy-admin/src/main/resources/templates/financial/master.html b/ghy-admin/src/main/resources/templates/financial/master.html
new file mode 100644
index 00000000..30823ddb
--- /dev/null
+++ b/ghy-admin/src/main/resources/templates/financial/master.html
@@ -0,0 +1,139 @@
+<!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="financial-form">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                订单号：<input type="text" id="orderMasterCode" name="orderMasterCode"/>
+                            </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="financial:master: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('financial:master:edit')}]];
+    var payTypeDict = [[${@dict.getType ('pay_type')}]];
+    var payStatusDict = [[${@dict.getType ('pay_status')}]];
+    var prefix = ctx + "financial/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);
+        }
+        queryFinancialList();
+    });
+
+    function queryFinancialList() {
+        var options = {
+            url: prefix + "/list",
+            exportUrl: prefix + "/export",
+            sortName: "createTime",
+            sortFinancial: "desc",
+            modalName: "财务单",
+            columns: [
+                {
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '财务单ID',
+                    visible: false
+                },
+                {
+                    field: 'orderMasterId',
+                    title: '主订单序号',
+                    visible: false
+                },
+                {
+                    field: 'orderMasterCode',
+                    title: '主订单编码'
+                },
+                {
+                    field: 'totalMoney',
+                    title: '整单总金额'
+                },
+                {
+                    field: 'discountMoney',
+                    title: '优惠金额'
+                },
+                {
+                    field: 'payMoney',
+                    title: '实付金额'
+                },
+                {
+                    field: 'payType',
+                    title: '支付方式',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(payTypeDict, value);
+                    }
+                },
+                {
+                    field: 'payStatus',
+                    title: '支付状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(payStatusDict, value);
+                    }
+                },
+                {
+                    field: 'payTime',
+                    title: '付款时间'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间'
+                }
+            ]
+        };
+        $.table.init(options);
+    }
+
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
index 35235082..839763dd 100644
--- a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -13,7 +13,6 @@
         <result property="customerLogoUrl"     column="customer_logo_url"     />
         <result property="customerPlace"     column="customer_place"     />
         <result property="parentCustomerPlace"     column="parent_customer_place"     />
-        <result property="customerLogoUrl"     column="customer_logo_url"     />
         <result property="createBy"            column="create_by"     />
         <result property="createTime"          column="create_time"   />
         <result property="updateBy"            column="update_by"     />
@@ -26,7 +25,7 @@
                customer_logo_url, customer_place, parent_customer_place, create_by, create_time, remark
         FROM customer
     </sql>
-    
+
     <select id="getCustomerList" resultMap="CustomerResult">
         <include refid="selectCustomer" />
         <where>
@@ -69,15 +68,15 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
-        <if test="customerId != null and customerId != 0">${customer_id},</if>
-        <if test="name != null and name != ''">${name},</if>
-        <if test="account != null and account != ''">${account},</if>
-        <if test="phone != null and phone != ''">${phone},</if>
-        <if test="customerLogoUrl != null and customerLogoUrl != ''">${customer_logo_url},</if>
-        <if test="openId != null and openId != ''">${open_id},</if>
-        <if test="status != null and status != ''">${status},</if>
-        <if test="remark != null and remark != ''">${remark},</if>
-        <if test="createBy != null and createBy != ''">${create_by},</if>
+        <if test="customerId != null and customerId != 0">#{customerId},</if>
+        <if test="name != null and name != ''">#{name},</if>
+        <if test="account != null and account != ''">#{account},</if>
+        <if test="phone != null and phone != ''">#{phone},</if>
+        <if test="customerLogoUrl != null and customerLogoUrl != ''">#{customerLogoUrl},</if>
+        <if test="openId != null and openId != ''">#{openId},</if>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
         )
     </insert>
@@ -85,10 +84,10 @@
     <update id="updateCustomer" parameterType="com.ghy.customer.domain.Customer">
         update costomer
         <set>
-            <if test="name != null and name != ''">name = ${name},</if>
-            <if test="account != null and account != ''">account = ${account},</if>
-            <if test="phone != null and phone != ''">phone = ${phone},</if>
-            <if test="customerLogoUrl != null and customerLogoUrl != ''">customer_logo_url = ${customer_logo_url},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="account != null and account != ''">account = #{account},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="customerLogoUrl != null and customerLogoUrl != ''">customer_logo_url = #{customerLogoUrl},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -97,4 +96,4 @@
         where customer_id = #{customerId}
     </update>
 
-</mapper>
\ No newline at end of file
+</mapper>
