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

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java

@@ -55,4 +55,10 @@
    */

   int getMaxOrder();

   

   /**

    * 获取有效分类

    * @return

    */

   List<GoodsClass> getEffectiveClass();

	
}