Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -29,7 +29,7 @@
   private String card; // 匹配标识



   @Column(name = "sp_state")

   private Integer state; // 状态： 1 停用  0启用

   private Integer state; // 状态： 1 停用   0启用

   

   @Column(name = "sp_createtime")

   private Date createtime; // 创建时间