Merge remote-tracking branch 'origin/master'

doum

9 天以前 3c5771460c280139a53e0c451e6ceb8742680b5c

 server/services/src/main/java/com/doumee/service/business/CategoryService.java

@@ -94,4 +94,7 @@
     * @return long
     */
    long count(Category category);


    List<Category> getCategoryList(Integer type);
}