Merge branch 'score_shop' into api_score_meger

jyy

2021-07-28 8d5f34d66f7339390ac63e92c3a065d1db3e05c4

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

@@ -145,7 +145,7 @@
                    title: "打印服务单",
                    area: ['250px', '550px'],
                    maxmin: true,
                    content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
                    content: [basePath + '/admin/projService/printOrder?id=' + id]
                });
            },
            toBack() {