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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

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

@@ -168,7 +168,7 @@
                             <th width="80">产品名称</th>
                             <th width="30">购买数量</th>
                             <th width="30">备注</th>
-                            <th width="80">推送状态</th>
+                            <#--<th width="80">推送状态</th>-->
                         </tr>
                         </thead>
                         <tbody id="send_tbody">
@@ -379,7 +379,7 @@
                             '<td style="' + style + '">' + order.orderProductName + '</td>'+
                             '<td style="' + style + '">' + order.orderNum + '</td>'+
                             '<td style="' + style + '">' + order.orderRemark + '</td>'+
-                            '<td style="' + style + '">' + order.returnMsg + '</td>'+
+                            /*'<td style="' + style + '">' + order.returnMsg + '</td>'+*/
                             '</tr>');
                 }
                 error_path = result.returnMsg.errorPath;