Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 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";