From d4987f06860c91ea877e762448589f9fed9fb275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Thu, 19 May 2022 16:44:06 +0800
Subject: [PATCH] v3.15.2 release (^.^)YYa!!

---
 README.md   | 2 +-
 changes.txt | 6 ++++++
 pom.xml     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8fedb1230..b97a876b6 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Jboot 是一个基于 JFinal、Dubbo、Seata、Sentinel、ShardingSphere、Nacos
 <dependency>
     <groupId>io.jboot</groupId>
     <artifactId>jboot</artifactId>
-    <version>3.15.1</version>
+    <version>3.15.2</version>
 </dependency>
 ```
 
diff --git a/changes.txt b/changes.txt
index 71c8d612a..f456812c8 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,9 @@
+jboot v3.15.2:
+修复：DAO 配置了 loadColumns 时又配置了 distinct 时，无法获得正确结果的问题
+优化：优化 Columns.toString() 方法，防止在开发工具 debug 下显示 "null" 的问题
+
+
+
 jboot v3.15.1:
 新增：JbootOutputDirectiveFactory，用于忽略在生产环境下，模板引擎执行的错误输出
 新增：CodeGenHelpler 新增对 infomix 数据库的支持，感谢 @xujianxie
diff --git a/pom.xml b/pom.xml
index 7e5df56b1..715bbc722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.jboot</groupId>
     <artifactId>jboot</artifactId>
-    <version>3.15.2-SNAPSHOT</version>
+    <version>3.15.2</version>
     <packaging>jar</packaging>
 
     <name>jboot</name>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.2</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>