From c6a523834c4dca105c3b6baf7b630fb02293bcaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 3 Dec 2021 14:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/CommonController.cs | 1 +
ZR.CodeGenerator/CodeGeneratorTool.cs | 8 +--
ZR.Vue/src/components/UploadImage/index.vue | 2 +-
ZR.Vue/src/views/index.vue | 69 ++-----------------
ZR.Vue/src/views/tool/gen/editTable.vue | 2 +-
5 files changed, 12 insertions(+), 70 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs
index d252b86..39225ea 100644
--- a/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/ZR.Admin.WebApi/Controllers/CommonController.cs
@@ -41,6 +41,7 @@ namespace ZR.Admin.WebApi.Controllers
///
[ActionPermissionFilter(Permission = "tool:email:send")]
[Log(Title = "发送邮件", IsSaveRequestData = false)]
+ [HttpPost]
public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo)
{
if (sendEmailVo == null || string.IsNullOrEmpty(sendEmailVo.Subject) || string.IsNullOrEmpty(sendEmailVo.ToUser))
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index a9bbfad..8a1873d 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -318,10 +318,10 @@ namespace ZR.CodeGenerator
"bigint" => "long",
"tinyint" => "byte",
"numeric" or "real" or "float" => "float",
- "decimal" or "numer(8,2)" => "decimal",
+ "decimal" or "numer(8,2)" or "numeric" => "decimal",
"bit" => "bool",
- "date" or "datetime" or "datetime2" or "smalldatetime" => "DateTime",
- "money" or "smallmoney" => "double",
+ "date" or "datetime" or "datetime2" or "smalldatetime" or "timestamp" => "DateTime",
+ "money" or "smallmoney" => "decimal",
_ => "string",
};
return sTempDatatype;
@@ -409,7 +409,7 @@ namespace ZR.CodeGenerator
///
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{
- Engine.Current.Clean();
+ //Engine.Current.Clean();
//jnt模板引擎全局变量
Engine.Configure((options) =>
diff --git a/ZR.Vue/src/components/UploadImage/index.vue b/ZR.Vue/src/components/UploadImage/index.vue
index 87b3ee9..e52078e 100644
--- a/ZR.Vue/src/components/UploadImage/index.vue
+++ b/ZR.Vue/src/components/UploadImage/index.vue
@@ -11,7 +11,7 @@
:headers="headers"
style="display: inline-block; vertical-align: top"
>
- ![]()
+
diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue
index 52fda30..22eeac4 100644
--- a/ZR.Vue/src/views/index.vue
+++ b/ZR.Vue/src/views/index.vue
@@ -43,6 +43,8 @@
Github
+ 更新日志
+
如果觉得不错欢迎给个⭐Star⭐收藏一下 ，这样作者才有继续免费下去的动力，谢谢！
@@ -98,77 +100,16 @@
捐赠支持
-
如果觉得有用你可以请作者喝杯咖啡☕表示鼓励
