Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2004,6 +2004,7 @@ namespace Mall.WebApi.Controllers
             {
                 resultMallShopStyle?.main,
                 resultMallShopStyle?.secondary,
+                resultMallShopStyle?.IsEducation,
             };
 
             var setting = new

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -983,7 +983,23 @@ namespace Mall.WebApi.Controllers.MallBase
             }));
         }
 
-
+        /// <summary>
+        /// 获取默认上传信息的详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetDefaultFileStore()
+        {
+            var parms = RequestParm;
+            var query = new RB_File_Store();
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var model = mallBaseModule.GetFileStoreList(query).Where(x=>x.IsDefault==1).FirstOrDefault();
+            if (model == null)
+            {
+                model = new RB_File_Store();
+            }
+            return ApiResult.Success("获取成功", model);
+        }
 
         #endregion