Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 5041501b2eb692573e4f30e7cc4459149c117da6

 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>