Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

 src/main/java/com/moral/controller/TestController.java

@@ -16,7 +16,6 @@

    @RequestMapping("/hello")
    public String hello() {

        return "Hello World";
    }