diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
index cac2005e..1ea9071d 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
@@ -158,7 +158,7 @@ public class JeroController<T, S extends IService<T>> {
      * @param response
      * @return
      */
-    protected Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
+    protected Result<T> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
index 4953fa10..853ed622 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
@@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.message.entity.SysMessage;
 import com.jero.modules.message.service.ISysMessageService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,7 +43,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 
 	/**
 	 * 分页列表查询
-	 * 
+	 *
 	 * @param sysMessage
 	 * @param pageNo
 	 * @param pageSize
@@ -50,8 +51,8 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 	 * @return
 	 */
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+	public Result<IPage<SysMessage>> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+								   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 		QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
 		Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize);
 		IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
@@ -60,24 +61,24 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 
 	/**
 	 * 添加
-	 * 
+	 *
 	 * @param sysMessage
 	 * @return
 	 */
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody SysMessage sysMessage) {
+	public Result<T> add(@RequestBody SysMessage sysMessage) {
 		sysMessageService.save(sysMessage);
 		return Result.OK("操作成功!");
 	}
 
 	/**
 	 * 编辑
-	 * 
+	 *
 	 * @param sysMessage
 	 * @return
 	 */
 	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody SysMessage sysMessage) {	
+	public Result<T> edit(@RequestBody SysMessage sysMessage) {
 		sysMessageService.updateById(sysMessage);
         return Result.OK("操作成功!");
 
@@ -85,24 +86,24 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 
 	/**
 	 * 通过id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+	public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
 		sysMessageService.removeById(id);
         return Result.OK("删除成功!");
 	}
 
 	/**
 	 * 批量删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+	public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 
 		this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
 	    return Result.OK("批量删除成功！");
@@ -110,12 +111,12 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 
 	/**
 	 * 通过id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+	public Result<SysMessage> queryById(@RequestParam(name = "id", required = true) String id) {
 		SysMessage sysMessage = sysMessageService.getById(id);
 		return Result.OK(sysMessage);
 	}
@@ -138,7 +139,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
 	 * @return
 	 */
 	@PostMapping(value = "/importExcel")
-	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+	public Result<SysMessage> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, SysMessage.class);
 	}
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
index 944691b4..6151f215 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
@@ -13,6 +13,7 @@ import com.jero.modules.message.entity.MsgParams;
 import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import com.jero.modules.message.util.PushMsgUtil;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,7 +49,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 
 	/**
 	 * 分页列表查询
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @param pageNo
 	 * @param pageSize
@@ -56,8 +57,8 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	 * @return
 	 */
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+	public Result<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+								   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 		QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
 		Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize);
 		IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper);
@@ -66,60 +67,60 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 
 	/**
 	 * 添加
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @return
 	 */
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
+	public Result<T> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
 		sysMessageTemplateService.save(sysMessageTemplate);
         return Result.OK("操作成功!");
 	}
 
 	/**
 	 * 编辑
-	 * 
+	 *
 	 * @param sysMessageTemplate
 	 * @return
 	 */
 	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
+	public Result<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
 		sysMessageTemplateService.updateById(sysMessageTemplate);
         return Result.OK("更新成功！");
 	}
 
 	/**
 	 * 通过id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+	public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
 		sysMessageTemplateService.removeById(id);
         return Result.OK("删除成功!");
 	}
 
 	/**
 	 * 批量删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+	public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 		this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功！");
 	}
 
 	/**
 	 * 通过id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+	public Result<SysMessageTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
 		SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
         return Result.OK(sysMessageTemplate);
 	}
@@ -142,7 +143,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
 	 * @return
 	 */
 	@PostMapping(value = "/importExcel")
-	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+	public Result<SysMessageTemplate> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, SysMessageTemplate.class);
 	}