Merge branch 'master' into dahuihui/develop

CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs

@@ -220,7 +220,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             oldModel.createTime = entity.createTime;
 
             //事物处理过程结束
-            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(entity);
+            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(oldModel);
             var bl = result.code == 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;

CoreCms.Net.Web.Admin/Dockerfile

@@ -1,5 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:5.0
 
+RUN apt-get update && apt-get install -y libgdiplus
+
 WORKDIR /app
 
 EXPOSE 80