Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-05 eb49e3205f7c187c473d59b33773cafa17f8e600

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

@@ -268,7 +268,6 @@
                    $("#userList").hide();
                }
            });
        updateHistory();
        $("#userList").mouseleave(function () {
            $(this).hide();
        })