From 65906e7cfa055cf630f8e9e19cc3c349fd5f131d Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期一, 25 三月 2024 11:29:46 +0800
Subject: [PATCH] 合并报错
---
WebApi/Controllers/HomeController.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/WebApi/Controllers/HomeController.cs b/WebApi/Controllers/HomeController.cs
index 245d60b..fd79d38 100644
--- a/WebApi/Controllers/HomeController.cs
+++ b/WebApi/Controllers/HomeController.cs
@@ -4,11 +4,8 @@
using System.Web;
using System.Web.Mvc;
-namespace SPump.TransferApi.Controllers
+namespace IStation.WebApi.Controllers
{
- /// <summary>
- ///
- /// </summary>
public class HomeController : Controller
{
/// <summary>
@@ -20,17 +17,19 @@
//var isUseSwagger = System.Configuration.ConfigurationManager.AppSettings["IsUseSwagger"];
//if (!string.IsNullOrEmpty(isUseSwagger) && !Convert.ToBoolean(isUseSwagger))
//{
- return View();
+ // return View();
//}
- //return Redirect("/swagger/ui/index");
+ //else
+ {
+ return Redirect("/swagger/ui/index");
+ }
+
}
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
public ActionResult Test()
- {
+ {
+ ViewBag.Title = "Home Page";
+
return View();
}
}
--
Gitblit v1.9.3