From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
index ecb83bf..a3c2981 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
@@ -12,31 +13,38 @@
@ApiModel("蹇楅偊IAM浜哄憳璐﹀彿鎵�灞炵粍缁囧弬鏁�")
public class IamUserOrgModel implements Serializable {
@JsonProperty("idt_org__id")
+ @JSONField(name="idt_org__id")
@SerializedName("idt_org__id")
@ApiModelProperty(value = "缁勭粐id")
private String orgId;
+ @JSONField(name="idt_org__first_level_type")
@JsonProperty("idt_org__first_level_type")
@SerializedName("idt_org__first_level_type")
@ApiModelProperty(value = "銆愪竴绾х粍缁囩被鍨嬨�戯紙1:HR銆�2:鍔犵洘鍟嗐��3:铏氭嫙缁勭粐锛�")
private String firstLevelType;
+ @JSONField(name="idt_org__second_level_type")
@JsonProperty("idt_org__second_level_type")
@SerializedName("idt_org__second_level_type")
@ApiModelProperty(value = "銆愪簩绾х粍缁囩被鍨嬨��")
private String secondLevelType;
- @JsonProperty(" idt_org__old_id")
- @SerializedName(" idt_org__old_id")
+ @JSONField(name="idt_org__old_id")
+ @JsonProperty("idt_org__old_id")
+ @SerializedName("idt_org__old_id")
@ApiModelProperty(value = "鑰両d")
private String orgOldId;
- @JsonProperty(" idt_org__name")
- @SerializedName(" idt_org__name")
+ @JsonProperty("idt_org__name")
+ @JSONField(name="idt_org__name")
+ @SerializedName("idt_org__name")
@ApiModelProperty(value = "缁勭粐鍚嶇О")
private String orgName;
+ @JSONField(name="idt_org__org_code")
@JsonProperty("idt_org__org_code")
@SerializedName("idt_org__org_code")
@ApiModelProperty(value = "缁勭粐缂栫爜")
private String orgCode;
- @JsonProperty(" idt_org__parent_id")
- @SerializedName(" idt_org__parent_id")
+ @JsonProperty("idt_org__parent_id")
+ @JSONField(name="idt_org__parent_id")
+ @SerializedName("idt_org__parent_id")
@ApiModelProperty(value = "涓婄骇id")
private String orgParentId;
}
--
Gitblit v1.9.3