Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/ufo-platform into test6.9.7

@@ -31,7 +31,7 @@ public class OrderConfigConstant {
         orderRegionAttributeMap.put(RegionEnum.MAINLAND.getCode(), orderAttributeMap);
 
         Map<Integer, String> hkAttributeMap = new HashMap<>();
-        hkAttributeMap.put(OrderAttributes.OVERSEAS_IN_STOCK.getCode(), "海外现货");
+        hkAttributeMap.put(OrderAttributes.OVERSEAS_IN_STOCK.getCode(), "海外直邮");
         hkAttributeMap.put(OrderAttributes.OVERSEAS_PRE_SALE.getCode(), "海外预售");
 
         orderRegionAttributeMap.put(RegionEnum.HONGKONG.getCode(), hkAttributeMap);

@@ -466,7 +466,7 @@ function getOrderInfo(orderCode){
                  }else if("6" == attributes){
                      attributesStr = '二手';
                  }else if("17" == attributes){
-                	 attributesStr = '香港直邮';
+                	 attributesStr = '海外直邮';
                  }
             	 $("#preSellOrNormal").html(attributesStr);
                  if (result.data.activityType == 18) {

@@ -134,7 +134,7 @@
                     <option value="4">预售</option>
                     <option value="5">全新瑕疵</option>
                     <option value="6">二手</option>
-                    <option value="11">海外现货</option>
+                    <option value="11">海外直邮</option>
                 </select>
                 <label>买家下单时间：</label>
                 <input id="buyerStartTime" type="text">