Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5

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

@@ -238,7 +238,7 @@
                  title: "打印订单",
                  area: ['250px', '550px'],
                  maxmin: true,
                  content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
                  content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
                  cancel: function (index, layero) {
                     _this.closeFram();
                  }