Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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;