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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

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

@@ -80,7 +80,7 @@
   @Column(name = "fa_order")

   private Integer order;

   

   // 适用类型 1新人

   // 适用类型 ： 0通用  1新人

   @Column(name = "fa_type")

   private Integer type;