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

JiangYouYao

2022-03-15 9c5d7547fa9b37c09659c90448ade6df6db4f2de

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

@@ -1103,6 +1103,7 @@
                                //结算打印提示
                                if (submitType == 1) {
                                    if (_this.printPaper) {
                                        _this.$message.success(data.info);
                                        _this.print();
                                    } else {
                                        _this.$message.success({