Merge branch 'master' into production

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.4.11</version>
+    <version>2.4.12</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/ui/static/templates/alipayaps/v1/payment.js

@@ -256,6 +256,7 @@ $(function () {
         }
         data.coupons = dataCache.coupons;
         data.qrcodeVersion = window.qrcodeVersion;
+        data.apsoverseas = window.apsoverseas;
 
         $.ajax({
             url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders',

src/main/ui/static/templates/alipayaps/v4/payment.js

@@ -302,6 +302,8 @@ $(function () {
         }
         data.coupons = dataCache.coupons;
         data.qrcodeVersion = window.qrcodeVersion;
+        data.apsoverseas = window.apsoverseas;
+
         $.ajax({
             url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders',
             method: 'POST',

src/main/ui/static/templates/alipayaps/v5/payment.js

@@ -265,6 +265,8 @@ $(function () {
         }
         data.coupons = dataCache.coupons;
         data.qrcodeVersion = window.qrcodeVersion;
+        data.apsoverseas = window.apsoverseas;
+
         $.ajax({
             url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders',
             method: 'POST',