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/GoodsSubClassLabel.java

@@ -5,6 +5,8 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;



/**

 * 二级分类标签

 * 

@@ -21,9 +23,11 @@
   public GoodsSubClassLabel() {

   }



   @Expose

   @Column(name = "scl_id")

   private Long id;// 主键ID



   @Expose

   @Column(name = "scl_name")

   private String name;// 名字

   @Column(name = "scl_order_by")