Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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

@@ -76,6 +76,11 @@
      this.id = id;

   }



   public GoodsClass(Long id, String name) {

      this.id = id;

      this.name = name;

   }



   public GoodsClass(String name, String picture, Integer orderby, Long createtime) {

      super();

      this.name = name;