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

wl

2022-10-17 d46beba25ccb64a1047a98d642b6ce45e82f0bee

 ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java

@@ -58,4 +58,8 @@
    public boolean isEnabled() {
        return umsAdmin.getStatus().equals(1);
    }

    public Long getUserId(){
        return umsAdmin.getId();
    }
}