Merge remote-tracking branch 'origin/develop' into develop

pom.xml

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

src/document/cn/apis.js

@@ -563,6 +563,7 @@
  * @apiSuccess (ROOT) {JSON[]} transactions 流水列表
  *
  * @apiSuccess (transactions) {String} transaction_time 交易时间，格式yyyyMMddHHmmss，GMT+10
+ * @apiSuccess (transactions) {String} partner_code 订单关联商户
  * @apiSuccess (transactions) {String} order_id RoyalPay订单ID
  * @apiSuccess (transactions) {String} partner_order_id 商户订单ID
  * @apiSuccess (transactions) {String} channel_order_id 渠道方(Alipay/Bestpay/Wechat)订单号
@@ -628,6 +629,7 @@
  * @apiSuccess (ROOT) {JSON[]} transactions 流水列表
  *
  * @apiSuccess (transactions) {String} transaction_time 交易时间，格式yyyyMMddHHmmss，GMT+10
+ * @apiSuccess (transactions) {String} partner_code 订单关联商户
  * @apiSuccess (transactions) {String} order_id RoyalPay订单ID
  * @apiSuccess (transactions) {String} partner_order_id 商户订单ID
  * @apiSuccess (transactions) {String} channel_order_id 渠道方(Alipay/Bestpay/Wechat)订单号

src/document/en/apis.js

@@ -573,6 +573,7 @@
  * @apiSuccess (ROOT) {JSON[]} transactions transaction list
  *
  * @apiSuccess (transactions) {String} transaction_time Trade time, format as yyyyMMddHHmmss，GMT+10
+ * @apiSuccess (transactions) {String} partner_code Order connected partner code
  * @apiSuccess (transactions) {String} order_id RoyalPay Order ID
  * @apiSuccess (transactions) {String} partner_order_id Partner Order ID
  * @apiSuccess (transactions) {String} channel_order_id Order ID in payment channel (Alipay/Bestpay/Wechat)
@@ -639,6 +640,7 @@
  * @apiSuccess (ROOT) {JSON[]} transactions transaction list
  *
  * @apiSuccess (transactions) {String} transaction_time Trade time, format as yyyyMMddHHmmss，GMT+10
+ * @apiSuccess (transactions) {String} partner_code Order connected partner code
  * @apiSuccess (transactions) {String} order_id RoyalPay Order ID
  * @apiSuccess (transactions) {String} partner_order_id Partner Order ID
  * @apiSuccess (transactions) {String} channel_order_id Order ID in payment channel (Alipay/Bestpay/Wechat)