Merge branch 'dev' into test

This commit is contained in:
chenbowen
2025-11-25 17:43:28 +08:00

View File

@@ -4,9 +4,12 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.zt.plat.module.system.service.integration.iwork.jackson.LenientIntegerDeserializer;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@@ -157,6 +160,7 @@ public class IWorkHrUserPageRespVO {
@Schema(description = "显示顺序")
@JsonProperty("dsporder")
@JsonDeserialize(using = LenientIntegerDeserializer.class)
private Integer dsporder;
@Schema(description = "系统语言")