Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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

@@ -22,7 +22,10 @@
      return new ResultBean("操作成功",SUCCESS);

   }

   public static ResultBean fail(){

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

      return fail("操作失败");

   }

   public static ResultBean fail(String msg){

      return new ResultBean(msg,FAIL);

   }

   public ResultBean(Throwable e) {

      this.message = e.toString();