Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

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