Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/controller/LoginLogController.java

@@ -131,7 +131,7 @@ public class LoginLogController {
             @ApiParam(value = "开始时间yyyy-MM-dd") @RequestParam(required = false) String beginTime,
             @ApiParam(value = "结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "条数，非必传，默认30条",  defaultValue = "30") @RequestParam(required = false, defaultValue = "30") Integer pageSize
+            @ApiParam(value = "条数，非必传，默认10条",  defaultValue = "10") @RequestParam(required = false, defaultValue = "10") Integer pageSize
 
 
 

user_center/src/main/java/com/huaxu/controller/OperateLogController.java

@@ -126,7 +126,7 @@ public class OperateLogController {
             @ApiParam(value = "开始时间yyyy-MM-dd") @RequestParam(required = false) String beginTime,
             @ApiParam(value = "结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "条数，非必传，默认30条",  defaultValue = "30") @RequestParam(required = false, defaultValue = "30") Integer pageSize
+            @ApiParam(value = "条数，非必传，默认10条",  defaultValue = "10") @RequestParam(required = false, defaultValue = "10") Integer pageSize
 
 
 

user_center/src/main/java/com/huaxu/controller/TenantController.java

@@ -176,7 +176,7 @@ public class TenantController {
     public AjaxMessage<Pagination<TenantDto>> selectPage(
             @ApiParam(value = "租户名称")  @RequestParam(required = false) String tenantName,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "条数，非必传，默认30条",  defaultValue = "30") @RequestParam(required = false, defaultValue = "30") Integer pageSize
+            @ApiParam(value = "条数，非必传，默认12条",  defaultValue = "12") @RequestParam(required = false, defaultValue = "12") Integer pageSize
 
     ) {
         TenantDto tenantDto = new TenantDto();