Merge remote-tracking branch 'origin/master'

admin

2019-05-05 d1fe0aeb6aa1f205c6cfae319ebc91f33c1db3f6

 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;