Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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