From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html index 867bbc2..1287221 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html @@ -1,9 +1,4 @@ - - - - - -<!DOCTYPE HTML> +<!DOCTYPE HTML> <html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml"> <head> <meta charset="utf-8"> -- Gitblit v1.9.1