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-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -466,9 +466,9 @@
     <foreach collection="list" item="item" index="index" separator=";" open="" close="">
       update tb_rst_sales_order_info
       <set>
-        <if test="item.salesIsDownload != null" >
+        <!--<if test="item.salesIsDownload != null" >-->
           sales_is_download = 2
-        </if>
+        <!--</if>-->
       </set>
       where sales_id = #{item.salesId}
     </foreach>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -470,7 +470,11 @@ public class AdminSalesOrderController {
             // 创建单元格，设置值
             row.createCell(0).setCellValue(order.getSalesId());
             row.createCell(1).setCellValue(order.getSalesSalesTime()==null?"":format2.format(order.getSalesSalesTime()));
-            row.createCell(2).setCellValue(storeInfo.getStoreId());
+            if(storeInfo != null){
+                row.createCell(2).setCellValue(storeInfo.getStoreId());
+            }else{
+                row.createCell(2).setCellValue("");
+            }
             row.createCell(3).setCellValue(order.getSalesDealCode());
             row.createCell(4).setCellValue(order.getSalesAddressName());
             row.createCell(5).setCellValue(order.getSalesAddressName());