Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 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="会员">