Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-20 c161f76f78fead2519b8a66ab30d6e7389deead1

 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">