fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html

@@ -41,7 +41,7 @@
        </el-col>
    </el-row>

    <el-row class="table-style"  >
    <el-row class="table-style"  style="margin-left: 50px;">
        <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
            <el-table-column
                    label="会员">