Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
-import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -27,7 +26,6 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -71,7 +69,7 @@ public class OperDefectStatisticsController extends BladeController {
 	})
 	@OperationAnnotation(moduleName = "缺陷管理",title = "缺陷记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "分页查询缺陷记录列表")
-	public R<BladePage<OperDefectStatisticsVO>> list(@SpringQueryMap OperDefectStatisticsVO entity) {
+	public R<IPage<OperDefectStatisticsVO>> list(@RequestBody  OperDefectStatisticsVO entity) {
 		Query query=new Query();
 		query.setCurrent(entity.getCurrent());
 		query.setSize(entity.getSize());
@@ -87,7 +85,7 @@ public class OperDefectStatisticsController extends BladeController {
 				return o;
 			}).collect(Collectors.toList()));
 		}
-		return R.data(BladePage.of(vos));
+		return R.data(vos);
 	}
 
 	/**