Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-11 822b96ee741e429d80779cd17bb7c2c00dca44f2

 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();
        })