Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/ClassModule.cs

@@ -741,6 +741,10 @@ namespace Edu.Module.Course
             {
                 dayClassHours = dayMinutes / model.ClassHourMinute;
             }
+            else
+            {
+                dayClassHours = dayMinutes / class_ConfigRepository.GetBasicMinutesRepository(model.Group_Id);
+            }
             return dayClassHours;
         }
 

Edu.WebApi/appsettings.json

@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
     "DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",