Merge branch 'master' into dev

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -261,7 +261,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'STANDARD_PRICE' => [
-                    'header' => 'Standard Amount', // 商品金额
+                    'header' => 'Total Price($)', // 商品金额
                     'headerOther' => [
                         'width' => '150',
                     ],