Merge branch 'score_shop' into api_score_meger

wzy

2021-11-21 befa8124e15d7d7e2d2026c2596561b11a9ee573

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