wms / wms4_hh · Commits

Commit 4d86ff133acc0e02c8b9fcd58f9112dac7afca2f

Authored by zhangdaiscott
1 parent d663fd5a

swagger接口返回值，显示的是object问题

Inline Side-by-side
Showing 2 changed files with 11 additions and 11 deletions
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
  View file @4d86ff1
... ... @@ -71,16 +71,16 @@ public class Result<T> implements Serializable {
71 71 }
72 72  
73 73 @Deprecated
74   - public static Result<Object> ok() {
75   - Result<Object> r = new Result<Object>();
  74 + public static<T> Result<T> ok() {
  75 + Result<T> r = new Result<T>();
76 76 r.setSuccess(true);
77 77 r.setCode(CommonConstant.SC_OK_200);
78 78 return r;
79 79 }
80 80  
81 81 @Deprecated
82   - public static Result<Object> ok(String msg) {
83   - Result<Object> r = new Result<Object>();
  82 + public static<T> Result<T> ok(String msg) {
  83 + Result<T> r = new Result<T>();
84 84 r.setSuccess(true);
85 85 r.setCode(CommonConstant.SC_OK_200);
86 86 r.setMessage(msg);
... ... @@ -88,8 +88,8 @@ public class Result&lt;T&gt; implements Serializable {
88 88 }
89 89  
90 90 @Deprecated
91   - public static Result<Object> ok(Object data) {
92   - Result<Object> r = new Result<Object>();
  91 + public static<T> Result<T> ok(T data) {
  92 + Result<T> r = new Result<T>();
93 93 r.setSuccess(true);
94 94 r.setCode(CommonConstant.SC_OK_200);
95 95 r.setResult(data);
... ... @@ -140,12 +140,12 @@ public class Result&lt;T&gt; implements Serializable {
140 140 return r;
141 141 }
142 142  
143   - public static Result<Object> error(String msg) {
  143 + public static<T> Result<T> error(String msg) {
144 144 return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
145 145 }
146 146  
147   - public static Result<Object> error(int code, String msg) {
148   - Result<Object> r = new Result<Object>();
  147 + public static<T> Result<T> error(int code, String msg) {
  148 + Result<T> r = new Result<T>();
149 149 r.setCode(code);
150 150 r.setMessage(msg);
151 151 r.setSuccess(false);
... ... @@ -162,7 +162,7 @@ public class Result&lt;T&gt; implements Serializable {
162 162 /**
163 163 * 无权限访问返回结果
164 164 */
165   - public static Result<Object> noauth(String msg) {
  165 + public static<T> Result<T> noauth(String msg) {
166 166 return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
167 167 }
168 168  
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
  View file @4d86ff1
... ... @@ -39,7 +39,7 @@ public class DuplicateCheckController {
39 39 */
40 40 @RequestMapping(value = "/check", method = RequestMethod.GET)
41 41 @ApiOperation("重复校验接口")
42   - public Result<Object> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
  42 + public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
43 43 Long num = null;
44 44  
45 45 log.info("----duplicate check------："+ duplicateCheckVo.toString());
... ...