Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java

@@ -33,11 +33,11 @@
        Long userId = SecurityUtils.getUserId();
        if (StringUtils.isNotBlank(userName)) {
            this.setFieldValByName("createBy", userName, metaObject);
            this.setFieldValByName("createId", userId, metaObject);
//            this.setFieldValByName("createId", userId, metaObject);
            this.setFieldValByName("updateBy", userName, metaObject);
        } else {
            this.setFieldValByName("createBy", userName, metaObject);
            this.setFieldValByName("createId", userId, metaObject);
//            this.setFieldValByName("createId", userId, metaObject);
            this.setFieldValByName("updateBy", userName, metaObject);
        }