Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/java/com/moral/common/bean/ResultBean.java

@@ -17,24 +17,20 @@
   private T data;



   public ResultBean() {

      super();

      this.message = "success";

      this.code = SUCCESS;

   }



   public ResultBean(Throwable e) {

      super();

      this.message = e.toString();

      this.code = FAIL;

   }



   public ResultBean(T data) {

      this();

      this.message = "success";

      this.code = SUCCESS;

      this.data = data;

   }



   public ResultBean(String message, int code) {

      super();

      this.message = message;

      this.code = code;

   }