Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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

@@ -18,7 +18,12 @@


   public ResultBean() {

   }



    public static ResultBean success(){

      return new ResultBean("操作成功",SUCCESS);

   }

   public static ResultBean fail(){

      return new ResultBean("操作失败",FAIL);

   }

   public ResultBean(Throwable e) {

      this.message = e.toString();

      this.code = FAIL;