Merge remote-tracking branch 'origin/master'

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -37,7 +37,7 @@ public class CustomerApiController {
     private RestClient restClient;
     @GetMapping("/getCustomerList")
     @ResponseBody
-    public AjaxResult getCustomerList(@RequestParam(defaultValue = "0") int pageNum,@RequestParam(defaultValue = "10") int pageSize,
+    public AjaxResult getCustomerList(@RequestParam(defaultValue = "1") int pageNum,@RequestParam(defaultValue = "10") int pageSize,
                                       String education,//学历
       String policybelong,//业绩归属
        String payS,String payE,  //年缴费区间
@@ -188,7 +188,7 @@ public class CustomerApiController {
             builder.append("\"should\":[]");//should
             builder.append("}");//boot结束
             builder.append("},");//query结束
-            builder.append("\"from\":"+(pageNum*10+1)+",");//第几页
+            builder.append("\"from\":"+((pageNum-1)*10+1)+",");//第几页
             builder.append("\"size\":"+pageSize+",");//查询几个
             builder.append("\"sort\":[{\"created_time\":{\"order\":\"desc\"}}],");//排序
             builder.append("\"aggs\":{}");//