<<<<<<< HEAD
package com.danchu.momuck.view;

import com.fasterxml.jackson.annotation.JsonProperty;

/**
 * ResultView
 *
 * @author geine
 */
public class ResultView {

    private String code;
    private String message;
    private Object data;

    @JsonProperty("code")
    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    @JsonProperty("message")
    public String getMessage() {
        return message;
    }

    public void setMessage(String message) {
        this.message = message;
    }

    @JsonProperty(value = "data")
    public Object getData() {
        return data;
    }

    public void setData(Object data) {
        this.data = data;
    }

    public ResultView(String code, String message, Object data) {
        super();
        this.code = code;
        this.message = message;
        this.data = data;
    }

    @Override
    public String toString() {
        return "ResultView [code=" + code + ", message=" + message + "]";
    }
}
=======
package com.danchu.momuck.view;

import com.fasterxml.jackson.annotation.JsonProperty;

/**
 * ResultView
 *
 * @author geine
 */
public class ResultView {

    private String code;
    private String message;
    private Object data;

    @JsonProperty("code")
    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    @JsonProperty("message")
    public String getMessage() {
        return message;
    }

    public void setMessage(String message) {
        this.message = message;
    }

    @JsonProperty(value = "data")
    public Object getData() {
        return data;
    }

    public void setData(Object data) {
        this.data = data;
    }

    public ResultView(String code, String message, Object data) {
        super();
        this.code = code;
        this.message = message;
        this.data = data;
    }

    @Override
    public String toString() {
        return "ResultView [code=" + code + ", message=" + message + "]";
    }
}

>>>>>>> branch 'feature/#20_review' of https://github.com/GESCC/danchu.git

@@ -9,1050 +9,9 @@
 HEAD
-%0Apackage com.danchu.momuck.view;%0A%0Aimport com.fasterxml.jackson.annotation.JsonProperty;%0A%0A/**%0A * ResultView%0A *%0A * @author geine%0A */%0Apublic class ResultView %7B%0A%0A    private String code;%0A    private String message;%0A    private Object data;%0A%0A    @JsonProperty(%22code%22)%0A    public String getCode() %7B%0A        return code;%0A    %7D%0A%0A    public void setCode(String code) %7B%0A        this.code = code;%0A    %7D%0A%0A    @JsonProperty(%22message%22)%0A    public String getMessage() %7B%0A        return message;%0A    %7D%0A%0A    public void setMessage(String message) %7B%0A        this.message = message;%0A    %7D%0A%0A    @JsonProperty(value = %22data%22)%0A    public Object getData() %7B%0A        return data;%0A    %7D%0A%0A    public void setData(Object data) %7B%0A        this.data = data;%0A    %7D%0A%0A    public ResultView(String code, String message, Object data) %7B%0A        super();%0A        this.code = code;%0A        this.message = message;%0A        this.data = data;%0A    %7D%0A%0A    @Override%0A    public String toString() %7B%0A        return %22ResultView %5Bcode=%22 + code + %22, message=%22 + message + %22%5D%22;%0A    %7D%0A%7D%0A=======
+%0D
 %0Apac
@@ -1096,84 +1096,7 @@
  %7D%0D%0A
+
 %7D%0D%0A
-%0D%0A%3E%3E%3E%3E%3E%3E%3E branch 'feature/#20_review' of https://github.com/GESCC/danchu.git%0A

Update ResultView.java