Merge branch 'develop'

src/document/cn/apidoc.json

@@ -29,7 +29,7 @@
     "HF_Online_Payment",
     "CB_BankPay",
     "SDKPayment",
-    "Custom",
+    "Customs_Declaration",
     "CommonApi",
     "GetExchange",
     "OrderStatus",

src/document/cn/apis.js

@@ -884,7 +884,7 @@
  * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。
  *
  * @apiVersion 1.0.0
- * @apiGroup Custom
+ * @apiGroup Customs_Declaration
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
@@ -929,7 +929,7 @@
  * 用于商户查询报关单号的状态。
  *
  * @apiVersion 1.0.0
- * @apiGroup Custom
+ * @apiGroup Customs_Declaration
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成

src/document/en/apidoc.json

@@ -29,7 +29,7 @@
     "HF_Online_Payment",
     "CB_BankPay",
     "SDKPayment",
-    "Custom",
+    "Customs_Declaration",
     "CommonApi",
     "GetExchange",
     "OrderStatus",

src/document/en/apis.js

@@ -901,7 +901,7 @@
  * Used to submit the attachment information of the order required by the merchant. WeChat and Alipay are only supported. WeChat only supports payment orders within one month for customs declaration.
  *
  * @apiVersion 1.0.0
- * @apiGroup Custom
+ * @apiGroup Customs_Declaration
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code Required, Partner code
@@ -946,7 +946,7 @@
  * Used by the merchant to check the status of the customs declaration number.
  *
  * @apiVersion 1.0.0
- * @apiGroup Custom
+ * @apiGroup Customs_Declaration
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code Required, Partner code

src/main/ui/index.html

@@ -934,7 +934,7 @@ margin-bottom: 10%;"/>
 
                             <li ng-if="31|withPartnerModule">
                                 <a ui-sref="custom">
-                                    Report Custom
+                                    Customs Declaration
                                 </a>
                             </li>
                             <li ui-sref-active="active" ng-if="30|withPartnerModule">
@@ -1071,4 +1071,4 @@ margin-bottom: 10%;"/>
 </div>
 <!-- ./wrapper -->
 </body>
-</html>
+</html>