Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-22 b6442b4640fd94b812419263b03c9ce5e2371c9a

 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java

@@ -9,6 +9,6 @@
    private static final long serialVersionUID = 1L;

    public UserPasswordNotMatchException() {
        super("user.password.not.match", null);
        super("user.password.not.match");
    }
}