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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 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() {