Merge branch '20240416_sun' of sckj/mz-cloud into master

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -315,7 +315,9 @@ public class SecurityUtils
     public static <T extends BaseEntity> void insertBaseEntity(T entity) {
         try {
             entity.setCreateTimeStr(DateUtils.dateTimeNow());
-            entity.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
+            if (StringUtils.isEmpty(entity.getCreateUserId())) {
+                entity.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
+            }
             entity.setCreateBy(SecurityUtils.getUsername());
             if (StringUtils.isEmpty(entity.getCreateUnit())) {
                 entity.setCreateUnit(SecurityUtils.getUserUnitId());