From 591f8aaeb20e5154106395201d54fe691ad8ffc6 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Mon, 8 Nov 2021 23:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml                  | 6 +++++-
 .../resources/jero/code-template-online/common/blob.ftl     | 1 +
 .../${entityPackage}/entity/${entityName}.javai             | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index d217899f..89d52d83 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -131,7 +131,11 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: 123456
+#          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl
index fd63b325..5a92c7db 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl
@@ -29,4 +29,5 @@
 <#else>
     @ApiModelProperty(value = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
+
 </#if>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index d9d06a4c..be860875 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -109,7 +109,6 @@ public class ${entityName} implements Serializable {
     @javax.validation.constraints.Pattern(regexp = "(^[1-9]([0-9]+)?(\\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\\.[0-9]([0-9])?$)",message = "请输入正确的金额")
         </#if>
      </#if>
-
     <#include "/common/blob.ftl">
 	</#list>
 }