Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -207,8 +207,10 @@ public abstract class EnvelopRestEndpoint extends Exception {
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return failed(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return failed(e.getMessage(),-10000);
        }
        if (e.getClass().equals(DataAccessException.class)) {
       /* if (e.getClass().equals(DataAccessException.class)) {
            e.printStackTrace();//数据库操作失败
            return null;
        } else if (e.getClass().toString().equals(
@@ -252,7 +254,7 @@ public abstract class EnvelopRestEndpoint extends Exception {
        } else {
            e.printStackTrace();//程序内部错误，操作失败！
            return null;
        }
        }*/
    }
    protected Envelop failed (String message, int status) {