Merge remote-tracking branch 'base-version/test' into dev

# Conflicts:
#	zt-module-databus/zt-module-databus-server-app/src/main/resources/application-dev.yml

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/user/dto/AdminUserRespDTO.java

@@ -4,6 +4,7 @@ import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 
@@ -20,6 +21,12 @@ public class AdminUserRespDTO implements VO {
     @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小王")
     private String nickname;
 
+    @Schema(description = "工号", example = "A00123")
+    private String workcode;
+
+    @Schema(description = "备注", example = "我是一个用户")
+    private String remark;
+
     @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long tenantId;