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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

 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);

   

   /**

    * 获取最大排序值