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

@@ -1014,6 +1014,10 @@ public class AdminOrderController {
             return ResponseJson.SUCCESS;
         }
         for (EfastOrder efastOrder: orderEfasts) {
+            String orderRemark = efastOrder.getOrderRemark();
+            if(StringUtil.isEmpty(orderRemark)){
+                efastOrder.setOrderRemark("");
+            }
             String orderId = efastOrder.getPlatformOrderId();
             salesOrder = mapsalesOrderList.get(orderId);
             if (salesOrder == null) {