From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/controller/TestController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/TestController.java b/src/main/java/com/moral/controller/TestController.java
index 3cc23e4..50f2fb0 100644
--- a/src/main/java/com/moral/controller/TestController.java
+++ b/src/main/java/com/moral/controller/TestController.java
@@ -16,7 +16,6 @@
@RequestMapping("/hello")
public String hello() {
-
return "Hello World";
}
--
Gitblit v1.8.0