Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java

@@ -384,7 +384,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
     @Override
     protected void resetDynamicProporties(OrderDetailInfo orderDetailInfo) {
         Long orderCode = orderDetailInfo.getOrderCode();
-        CodeMeta codeMeta = orderCode==null ? null : orderCodeGenerator.expId(orderCode);
+        CodeMeta codeMeta = orderCode == null ? null : orderCodeGenerator.expId(orderCode);
         //TabType tabType = TabType.SELL;
         Integer orderStatus = orderDetailInfo.getStatusDetail().getStatus();
         if (codeMeta!=null) {