Merge branch 'xianfeng' of http://gitlab.freemud.com/shangshang.dai/FmTakeaway into xianfeng

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

fmPrinter/fmPrinter.cpp

@@ -406,8 +406,8 @@ bool FmPrinter::_fmPrintData(OrderObject* pData)
 
             price = QString("%1       x%2       %3").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
                         .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
-            m_pPrintText(name.toLocal8Bit().data(),40);
-            m_pPrintText(price.toLocal8Bit().data(),40);
+            m_pPrintText(name.toLocal8Bit().data(),30);
+            m_pPrintText(price.toLocal8Bit().data(),30);
         }
         m_pPrintHex("\x0A",1);
         m_pPrintText((QString("在线支付：")+_Penny2Dollar(pData->total_fee-pData->discount_fee)).toLocal8Bit().data(),20);