From fef5a882eb7dc739fa1b0827cb8fc7a8c3b0bc44 Mon Sep 17 00:00:00 2001
From: terrfly <tengfei9753@sina.com>
Date: Wed, 12 Jun 2024 13:50:15 +0800
Subject: [PATCH] V2.4.0

---
 jeepay-manager/src/main/resources/banner.txt  | 2 +-
 jeepay-merchant/src/main/resources/banner.txt | 2 +-
 jeepay-payment/src/main/resources/banner.txt  | 2 +-
 pom.xml                                       | 2 +-
 upgrade.md                                    | 6 ++++++
 version.md                                    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jeepay-manager/src/main/resources/banner.txt b/jeepay-manager/src/main/resources/banner.txt
index 96c6edc..f3d34e1 100644
--- a/jeepay-manager/src/main/resources/banner.txt
+++ b/jeepay-manager/src/main/resources/banner.txt
@@ -4,5 +4,5 @@
 / /_/ //  __/  __/ /_/ / /_/ / /_/ /
 \____/ \___/\___/ .___/\__,_/\__, /
                /_/          /____/
- :: Jeepay ::        (v2.3.0.RELEASE)
+ :: Jeepay ::        (v2.4.0.RELEASE)
  让支付接入更简单 : https://www.jeequan.com
diff --git a/jeepay-merchant/src/main/resources/banner.txt b/jeepay-merchant/src/main/resources/banner.txt
index 96c6edc..f3d34e1 100644
--- a/jeepay-merchant/src/main/resources/banner.txt
+++ b/jeepay-merchant/src/main/resources/banner.txt
@@ -4,5 +4,5 @@
 / /_/ //  __/  __/ /_/ / /_/ / /_/ /
 \____/ \___/\___/ .___/\__,_/\__, /
                /_/          /____/
- :: Jeepay ::        (v2.3.0.RELEASE)
+ :: Jeepay ::        (v2.4.0.RELEASE)
  让支付接入更简单 : https://www.jeequan.com
diff --git a/jeepay-payment/src/main/resources/banner.txt b/jeepay-payment/src/main/resources/banner.txt
index 96c6edc..f3d34e1 100644
--- a/jeepay-payment/src/main/resources/banner.txt
+++ b/jeepay-payment/src/main/resources/banner.txt
@@ -4,5 +4,5 @@
 / /_/ //  __/  __/ /_/ / /_/ / /_/ /
 \____/ \___/\___/ .___/\__,_/\__, /
                /_/          /____/
- :: Jeepay ::        (v2.3.0.RELEASE)
+ :: Jeepay ::        (v2.4.0.RELEASE)
  让支付接入更简单 : https://www.jeequan.com
diff --git a/pom.xml b/pom.xml
index b189820..54ab046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
   <!-- 配置属性声明, 支持自定义参数 -->
   <properties>
 
-    <isys.version>2.3.0</isys.version> <!-- 指定当前[项目]版本号 -->
+    <isys.version>2.4.0</isys.version> <!-- 指定当前[项目]版本号 -->
     <projectRootDir>${basedir}</projectRootDir>
     <java.version>1.8</java.version> <!-- 指定java版本号 -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- 项目构建输出编码 -->
diff --git a/upgrade.md b/upgrade.md
index fc58eac..ec5d897 100644
--- a/upgrade.md
+++ b/upgrade.md
@@ -204,3 +204,9 @@
 3. 新增：一键部署安装、卸载脚本
 4. 修复： FastJSON开启安全模式，解决安全检测漏洞
 
+[v2.4.0_20240612]
+1. 新增：支付宝官方订单码支付方式
+2. 修复：分账状态问题 #I97MQM   
+3. 修复：解决商户通知转义问题#I9UT23
+4. 修复：解决退款直接成功时没有返回 successTime问题
+5. 优化：部分情况更新订单异常的现象
diff --git a/version.md b/version.md
index 65a3b16..7f90489 100644
--- a/version.md
+++ b/version.md
@@ -1 +1 @@
-v2.3.0_20240311
+v2.4.0_20240612