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

jyy

2021-04-13 8c383fda066ba6166ec3bf622d44d8b17bfac71f

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -276,6 +276,11 @@
                                    </template>
                                </el-table-column>
                                <el-table-column
                                        prop="source"
                                        label="来源"
                                        width="180">
                                </el-table-column>
                                <el-table-column
                                        prop="status"
                                        label="状态"
                                        width="180">