Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/document/cn/apis.js

@@ -776,7 +776,7 @@
  * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取）
  * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示AUD1.00
  * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码
- * @apiParam (JSON) {String=Alipay,Wechat} 支付渠道，必填，大小写敏感
+ * @apiParam (JSON) {String=Alipay,Wechat} channel 支付渠道，必填，大小写敏感
  * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知
  * @apiParam (JSON) {String} operator 操作人员标识
  * @apiParam (JSON) {String=android,iphone,ipad} system 客户端操作系统类型，支付宝通道可选，微信不需要

src/document/en/apis.js

@@ -790,7 +790,7 @@
  * @apiParam (JSON) {String} description Required, Order description
  * @apiParam (JSON) {int} price Required, Price of the order. Use the base unit of the currency.
  * @apiParam (JSON) {String=AUD,CNY} currency=AUD Currency
- * @apiParam (JSON) {String=Alipay,Wechat} payment channel, required, case sensitive
+ * @apiParam (JSON) {String=Alipay,Wechat} channel payment channel, required, case sensitive
  * @apiParam (JSON) {String} notify_url System will call the notify url if provided when the payment succeeds
  * @apiParam (JSON) {String} operator Note for the operator who created this order.
  * @apiParam (JSON) {String=android,iphone,ipad} system os type of client app, optional for Alipay, not required for Wechat