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

935090232@qq.com

2021-11-30 6cf7e063aa0c486c81beb6ed89386b501ad879f1

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