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

liyong

昨天 60806825951c111ac107dec87bd3acc5a7d6a707

 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;