Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

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

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