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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java

@@ -59,10 +59,10 @@
   private String searchJson; // 搜索条件



   @Column(name = "sub_ios_click")

   private Long iosClick = 0l;

   private Long iosClick;



   @Column(name = "sub_android_click")

   private Long androidClick = 0l;

   private Long androidClick;



   private String taobaoCids;