Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

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

@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Category;

import java.io.IOException;
import java.util.List;

/**
@@ -96,5 +98,11 @@
    long count(Category category);


    List<Category> getCategoryList(Integer type);
    List<Category> getCategoryList(Integer type,Integer rank);

    /**
     * 战区信息同步
     * @throws IOException
     */
    void syncZhanQu() throws IOException;
}