Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

3 天以前 83f6a929a4a9ee2f67cfa6dd7d059c998380141d

 src/main/java/com/ruoyi/common/config/MybatisHandler.java

@@ -23,8 +23,8 @@
        this.strictInsertFill(metaObject, "updateTime",  LocalDateTime.class, LocalDateTime.now());
        this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
        this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
        this.strictInsertFill(metaObject, "createUser", Long.class, Optional.ofNullable(userId).orElse(0).longValue());
        this.strictInsertFill(metaObject, "updateUser", Long.class, Optional.ofNullable(userId).orElse(0).longValue());
        this.strictInsertFill(metaObject, "createUser", Long.class, userId == null ? 0 : userId.longValue());
        this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
        this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
    }