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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

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