From b6addbdc96eb4fba4c7b3a295ed9d47020f74ceb Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 24 May 2022 14:19:54 +0800 Subject: [PATCH] fix --- zq-erp/src/main/resources/templates/views/admin/index.html | 4 ---- zq-erp/src/main/resources/config/application-local.properties | 2 +- zq-erp/src/main/resources/config/application.properties | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/resources/config/application-local.properties b/zq-erp/src/main/resources/config/application-local.properties index 79bc8fe..abb9c52 100644 --- a/zq-erp/src/main/resources/config/application-local.properties +++ b/zq-erp/src/main/resources/config/application-local.properties @@ -2,7 +2,7 @@ #数据库链接 spring.datasource.username=root spring.datasource.password=root -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/db_alpha?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 #是否启用debug模式 diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 6b3f12e..af40963 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -1,5 +1,5 @@ -spring.profiles.active=alpha +spring.profiles.active=local evn=dev server.port=8080 diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html index 6d15706..96a5815 100644 --- a/zq-erp/src/main/resources/templates/views/admin/index.html +++ b/zq-erp/src/main/resources/templates/views/admin/index.html @@ -37,11 +37,7 @@ <a id="dLabel" data-toggle="dropdown" class="dropdown-toggle" href="#" aria-haspopup="true" aria-expanded="true"> <span class="clear" style="height: auto;"> <span class="block m-t-xs"> -<<<<<<< HEAD <strong class="font-bold">阿尔法云管理系统</strong> -======= - <strong class="font-bold">{{systemName}}</strong> ->>>>>>> feature/订单服务单代码改造 </span> </span> </a> -- Gitblit v1.9.1