merge

2017-11-05 09:18:01 +08:00
parent da16fc16b8
commit 3e8bdb04a0
46 changed files with 282 additions and 303 deletions
@@ -41,7 +41,7 @@ public class JSONObjResult {
    public static JSONObject toJSONObj(RestMessage rest) {
        JSONObjResult jsonObjResult = new JSONObjResult();
        jsonObjResult.setSuccess(rest.isSuccess());
-        jsonObjResult.setMessage(rest.getMsg());
+        jsonObjResult.setMessage(rest.getMessage());
        jsonObjResult.setData(JSONUtil.beanToMap(rest.getData()));
        jsonObjResult.setId(rest.getId());
        return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue));