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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ReportRequestAspect.java

@@ -71,11 +71,13 @@ public class ReportRequestAspect {
     private void fillArgsToRequestBody(Object[] args, Map<String, Object> storedParams, Parameter[] parameters) {
         for (int i = 0; i < args.length; i++) {
             Object arg = args[i];
-            Class<?> argClazz = arg.getClass();
+            //Class<?> argClazz = arg.getClass();
             RequestBody requestBodyAnno = parameters[i].getAnnotation(RequestBody.class);
             if (arg != null && requestBodyAnno != null) {
                 Object argBean = BeanUtil.mapToBean(storedParams, arg.getClass(), true);
-                BeanUtil.copyProperties(argBean, arg);
+
+                // 分页参数需要从
+                BeanUtil.copyProperties(argBean, arg, "pageSize", "pageNo", "isPage");
                 return;
             }
         }