From e396f8b5b207929b6f8255b73a6aa579f58a8295 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 25 Aug 2020 17:06:56 +0800
Subject: [PATCH 1/2] AdminDefault

---
 .../Learun.Application.Web/Controllers/HomeController.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs
index 15106427e..1ef696906 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs	
@@ -447,7 +447,7 @@ namespace Learun.Application.Web.Controllers
             switch (learn_UItheme)
             {
                 case "1":
-                    return View("AdminDefaultForDC");      // 经典版本
+                    return View("AdminDefault");      // 经典版本
                 case "2":
                     return View("AdminAccordion");    // 风尚版
                 case "3":

From 22f36a95c097dad2183be7e640858add3f2126a3 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 25 Aug 2020 17:08:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/XmlConfig/database.config            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 02b271a32..7ff661a4e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -30,5 +30,5 @@
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-
+<!--测试公共提交-->
 </connectionStrings>
\ No newline at end of file