Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-06 3c3250c96a13c796aa88f1366b6d278cb95739e5

 src/main/java/com/moral/security/common/ErrorCode.java

@@ -12,7 +12,7 @@
public enum ErrorCode {
    GLOBAL(2),

    AUTHENTICATION(10), JWT_TOKEN_EXPIRED(11);
    AUTHENTICATION(10), JWT_TOKEN_EXPIRED(11),ACCOUNT_EXPIRED(12);
    
    private int errorCode;