Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-17 301d10c88b03bc7993c64c3467b1bcb0b48104ea

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

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

        <el-row v-show="isShow" style="margin-top: 20px;">
        <el-row style="margin-top: 20px;">
            <el-col>
                <template v-for="paramSettingFour in shfs">
                    <el-form-item>
@@ -123,7 +123,7 @@
                :direction="direction"
                size="90%"
        >
            <el-row >
            <el-row style="margin-left: 50px;">
                <el-col :span="24">
                    <el-row class="vertical  ">
                        <el-input class="searchInput" @input="searchGoods()" v-model="queryKey"