From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/demo/controller/DemoIconController.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ots/project/demo/controller/DemoIconController.java b/src/main/java/com/ots/project/demo/controller/DemoIconController.java
index 4134579..2ab7a84 100644
--- a/src/main/java/com/ots/project/demo/controller/DemoIconController.java
+++ b/src/main/java/com/ots/project/demo/controller/DemoIconController.java
@@ -1,30 +1,18 @@
package com.ots.project.demo.controller;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-/**
- * 鍥炬爣鐩稿叧
- *
- * @author ots
- */
@Controller
@RequestMapping("/demo/icon")
public class DemoIconController {
private String prefix = "demo/icon";
-
- /**
- * FontAwesome鍥炬爣
- */
+
@GetMapping("/fontawesome")
public String fontAwesome() {
return prefix + "/fontawesome";
}
-
- /**
- * Glyphicons鍥炬爣
- */
+
@GetMapping("/glyphicons")
public String glyphicons() {
return prefix + "/glyphicons";
--
Gitblit v1.9.1