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

Edu.Repository/User/RB_AccountRepository.cs

@@ -439,7 +439,10 @@ FROM
                 {
                     where2.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.AccountType), query.AccountTypeStr);
                 }
-
+                if (query.AccountType > 0)
+                {
+                    where2.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.AccountType), (int)query.AccountType);
+                }
                 if (!string.IsNullOrEmpty(query.StartEntryTime))
                 {
                     where.AppendFormat(" AND b.{0}>='{1}' ", nameof(Employee_ViewModel.EntryTime), query.StartEntryTime);

Edu.WebApi/appsettings.json

@@ -29,7 +29,7 @@
   "UploadSiteUrl": "http://192.168.5.128:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
-  "ErpUrl": "http://localhost:8181/#",
+  "ErpUrl": "http://localhost:8181",
   "EducationUrl": "http://localhost:8181/",
   "WorkAPPDomain": "http://m.kookaku.com/pages",
   "Mongo": "mongodb://47.96.23.199:27017",