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

jyy

2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -1535,7 +1535,7 @@
                    return;
                }
                vipId = this.vipInfo.id;
                openAddService();
                openAddService(vipId);
            },
            // 开订单
            addOrder() {