Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/salary_management/personnelSalary/Payroll.vue

@@ -65,7 +65,7 @@
       <div class="table-operator">
         <a-button @click="createPayroll" type="primary" icon="plus">生成工资单</a-button>
         <a-button @click="addPayroll" type="primary" icon="plus">导入</a-button>
-        <!-- <a-button @click="daochu" type="primary" icon="plus">导出明细</a-button> -->
+        <a-button @click="daochu" type="primary" icon="plus">导出明细</a-button>
       </div>
 
       <div>