Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 299e3b3ae10786a5b00124333a3e732009f83295

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

@@ -47,7 +47,7 @@
   GoodsClass getByAdjoinOrder(@Param("order") Integer order, @Param("type") Integer type);

   

   

   List<GoodsClass> getGoodsClassAll();

   List<GoodsClass> getGoodsClassAll(@Param("sex")Integer sex);

   

   /**

    * 获取最大排序值