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/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -221,7 +221,7 @@ public class AdminSalesOrderController {
         List<OrderCorrectInfo> listOrderCorrectInfo = salesOrderService.listOrderCorrectInfo(order.getSalesId());
 
         //查询物流公司信息
-        if(order.getSalesPostFirm() != null || !order.getSalesPostFirm().equals("")){
+        if(order.getSalesPostFirm() != null ){
             LogisticsInfo logisticsInfo = new LogisticsInfo();
             logisticsInfo.setLogisticsRstCode(order.getSalesPostFirm());
             List<LogisticsInfo> logis = salesOrderService.getLogisticsInfo(logisticsInfo);

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

@@ -154,8 +154,8 @@
                         <th>产品市场价（￥）</th>
                         <th>产品折扣价（￥）</th>
                         <th>小结（￥）</th>
-                        <#--<th>成本（￥）</th>
-                        <th>成本小结（￥）</th>-->
+                        <th>成本（￥）</th>
+                        <th>成本小结（￥）</th>
                         <th>未退货数量</th>
                         <th>已退货数量</th>
                         <th>产品总数</th>
@@ -169,8 +169,8 @@
                                 <td>${((item.itemProductPrice/100)?string("0.##"))!''}</td>
                                 <td>${((item.itemProductDiscount/100)?string("0.##"))!''}</td>
                                 <td>${((item.itemTotal/100)?string("0.##"))!''}</td>
-                                <#--<td>${((item.itemCost/100)?string("0.##"))!''}</td>
-                                <td>${((item.itemCostTotal/100)?string("0.##"))!''}</td>-->
+                                <td>${((item.itemCost/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemCostTotal/100)?string("0.##"))!''}</td>
                                 <td>${item.itemNum-item.itemReturnNum}</td>
                                 <td>${item.itemReturnNum}</td>
                                 <td>${item.itemNum}</td>
@@ -235,7 +235,9 @@
             <tr>
                 <th width="10">物流公司：</th>
                 <td width="10" style="font-weight: normal;"><span>
-                ${order.salesPostFirmName!''}</span></td>
+                    <#if order.salesPostFirm??>
+                        ${order.salesPostFirmName!''}
+                    </#if></span></td>
                 <td width="10"></td>
                 <th width="10">物流单号：</th>
                 <td width="10" style="font-weight: normal;"><span>