Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java

@@ -20,6 +20,7 @@
   

   private static final long serialVersionUID = 1L;



   @Expose

   @Column(name = "pic_id")

   private Long id;