From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
index bf32258..e27f2a5 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -29,14 +29,14 @@
@Override
public void insertFill(MetaObject metaObject) {
// 获取登录信息
- String userName = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)) {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- }
+// String userName = SecurityUtils.getUsernameApplet();
+// if (StringUtils.isNotBlank(userName)) {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// } else {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// }
}
@@ -48,14 +48,14 @@
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- String userName = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)){
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- }
+// String userName = SecurityUtils.getUsernameApplet();
+// if (StringUtils.isNotBlank(userName)){
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// } else {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// }
}
}
--
Gitblit v1.7.1