Merge remote-tracking branch 'origin/master'

admin

2018-12-13 f5b843b018ff6867f477e2d088e665ffef97ba35

 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());