Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

@@ -396,8 +396,8 @@
         

         int maxOrder = swiperPictureService.getMaxOrderByBannerID(bannerId);

         record.setOrder(maxOrder + 1);

			
         record.setState(0);

         // 默认停用

         record.setState(1);

         record.setCreatetime(new Date());

         record.setUpdatetime(new Date());