Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2022-02-21 ea7ea2ec59a50db2fec8228efc81a63afd8283de

 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -109,4 +109,10 @@
     */
    int PASSWORD_MIN_LENGTH = 5;
    int PASSWORD_MAX_LENGTH = 20;

    /**
     * 管理员ID
     */
    Long ADMIN_ID = 1L;

}