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

yujian

2019-05-13 0efda3a0ac631642dfe879487d7b93415363bbd4

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

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

   int getMaxOrder();

   

   /**

    * 获取有效分类

    * @return

    */

   List<GoodsClass> getEffectiveClass();

	
}