Преглед изворни кода

!1210 修复数据库类类型datetime2不能转DateTime类型和代码生成配置时.net类型等于了数据库类型
Merge pull request !1210 from 轻风2016/cherry-pick-1718596492

zuohuaijun пре 1 година
родитељ
комит
eccdbb2d6d

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -112,7 +112,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
             codeGenConfig.PropertyName = tableColumn.PropertyName;// 实体属性名
             codeGenConfig.ColumnLength = tableColumn.ColumnLength;// 长度
             codeGenConfig.ColumnComment = tableColumn.ColumnComment;
-            codeGenConfig.NetType = tableColumn.DataType;
+            codeGenConfig.NetType = tableColumn.NetType;
             codeGenConfig.WhetherRetract = YesNoEnum.N.ToString();
 
             // 生成代码时,主键并不是必要输入项,故一定要排除主键字段

+ 1 - 1
Admin.NET/Admin.NET.Core/Util/CodeGenUtil.cs

@@ -242,7 +242,7 @@ public static class CodeGenUtil
             "bit" => "bool",
             "money" or "smallmoney" or "numeric" or "decimal" => "decimal",
             "real" => "Single",
-            "datetime" or "smalldatetime" => "DateTime",
+            "datetime" or "datetime2" or "smalldatetime" => "DateTime",
             "float" or "double" => "double",
             "image" or "binary" or "varbinary" => "byte[]",
             "uniqueidentifier" => "Guid",

+ 11 - 0
一键净化项目.bat

@@ -0,0 +1,11 @@
+@echo OFF
+ :begin
+ REM 删除前端文件及文件夹
+ DEL /f /s /q ".\Web\node_modules\*.*"
+ RD /s /q ".\Web\node_modules"
+ REM 循环删除指定文件夹下的文件夹
+ FOR /d /r ".\Admin.NET\" %%b in (bin,obj) do rd /s /q "%%b"
+ ECHO 【处理完毕,按任意键退出】
+ PAUSE>NUL
+ EXIT
+ GOTO BEGIN