merge

2018-02-27 16:37:49 +08:00
parent bdda8df5fc
commit 5746ebfc1d
21 changed files with 212 additions and 113 deletions
@@ -32,8 +32,9 @@ public class JSONObjResult {
    public static JSONObject toJSONObj(Object o, String message) {
        JSONObjResult jsonObjResult = new JSONObjResult();
        jsonObjResult.setSuccess(true);
-        if (StringUtils.isNotEmpty(message))
+        if (StringUtils.isNotEmpty(message)) {
            jsonObjResult.setMessage(message);
+        }
        jsonObjResult.setData(JSONUtil.beanToMap(o));
        return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue));
    }