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

liyong

5 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java

@@ -19,7 +19,7 @@
    @Override
    public Expression getTenantId() {
        try {
            Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
            Long tenantId = SecurityUtils.getLoginUser().getTenantId();
            return new LongValue(tenantId);
        } catch (Exception e) {
            return null;