Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 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;