Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 e9c394d8944d6afc40dc36336e4e93f4de1517c2

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