Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-09 e458ae3ec8c4ae734f6e5e32e3d970860a51ac82

 ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java

@@ -46,7 +46,7 @@
        try {
            if (isAdmin(getUserId())) {
                return null;
            } else if (hasRole("yw_admin")) {
            } else if (hasRole("zg_city")) {
                return null;
            }
            return getLoginUser().getUser().getUnitId();