From 4a338d4ab0fa19876612b2a352689a192d660c23 Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Thu, 02 Apr 2020 15:58:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
index a3172cf..a0a5f7a 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
@@ -49,12 +49,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return ${classname}Service.findList(params);
+ return ResultBody.ok().data(${classname}Service.findList(params));
}
/**
--
Gitblit v1.8.0