Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-11-30 8fc1e2dc0b0b0ebacfefe32850dad64be4440b1e

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

@@ -218,7 +218,7 @@
            title: "修改订单时间",
            maxmin: true,
            area: [MUI.SIZE_L, '500px'],
            content: [basePath + '/admin/projService/toServiceOrderUpdateTime?id=' + id]
            content: [basePath + '/admin/redirect/hive/beautySalon/updateServiceOrderTimeV2?id=' +id]
        });
    }