Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

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