Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -250,16 +250,11 @@
 
             <tr>
                 <th width="10">邮费成本：</th>
-                <td width="10" colspan="4" style="font-weight: normal;"><#if order.salesPostageCost??>${order.salesPostageCost/100}元</#if></td>
-
-            </tr>
-
-            <tr>
+                <td width="10" style="font-weight: normal;"><#if order.salesPostageCost??>${order.salesPostageCost/100}元</#if></td>
+                <td width="10"></td>
                 <th width="10">揽件时间：</th>
-                <td width="10" colspan="4" style="font-weight: normal;"><#if order.orderCaseDate??>${order.orderCaseDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
-
+                <td width="10" style="font-weight: normal;"><#if order.orderCaseDate??>${order.orderCaseDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
             </tr>
-
             </thead>
         </table>
         <div class="row cl">