Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 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;