分页查询pageInfo改成JSON通用格式

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -149,12 +149,14 @@ public class PublicInquiryController {
      *
      * @author hejq
      * @date 2018-01-17 10:27
-     * @param info 分页参数
-     * @param filter 过滤条件
+     * @param pageInfo 分页参数
+     * @param searchFilter 过滤条件
      * @return
      */
     @RequestMapping(method = RequestMethod.GET)
-    public Page<PurcInquiryItemInfo> getInquiry(PageInfo info, SearchFilter filter) {
+    public Page<PurcInquiryItemInfo> getInquiry(String pageInfo, String searchFilter) {
+        PageInfo info = JSONObject.parseObject(pageInfo, PageInfo.class);
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
         return publicInquiryService.findTodoByPageInfo(info, filter);
     }