diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 7caeabab0f..2a7b60c950 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4690,7 +4690,8 @@ export default { 'After binding, you can log in by scanning the QR code through International Lark', bind: 'Bind', unbind_success: 'Unbind successfully', - confirm_unbind_dingtalk: 'Are you sure you want to unbind DingTalk? ', + confirm_unbind_dingtalk: 'Are you sure you want to unbind {0}? ', + unbind_error: 'Current user origin is {0}, cannot unbind', pls_use: 'Please use ', bind_use_qr: 'Scan QR code to bind', pls_use_dingtalk: 'Please use DingTalk to scan QR code to log in', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index de8c88f218..2bf628c84d 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4556,7 +4556,8 @@ export default { international_lark_desc: '綁定後,您可透過國際飛書掃碼登入', bind: '綁定', unbind_success: '解綁成功', - confirm_unbind_dingtalk: '確定解除釘釘綁定嗎? ', + confirm_unbind_dingtalk: '確定解除{0}綁定嗎? ', + unbind_error: '當前用戶來源是{0},無法解綁', pls_use: '請使用', bind_use_qr: '掃描二維碼綁定', pls_use_dingtalk: '請使用釘釘掃描二維碼登入', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 979458468d..6723176c1e 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4565,6 +4565,7 @@ export default { bind: '绑定', unbind_success: '解绑成功', confirm_unbind_dingtalk: '确定解除{0}绑定吗?', + unbind_error: '当前用户来源是{0},无法解绑', pls_use: '请使用', bind_use_qr: '扫描二维码绑定', pls_use_dingtalk: '请使用钉钉扫描二维码登录', diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java index 9a357de0fb..afcfe0be65 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java @@ -47,6 +47,9 @@ public class UserFormVO implements Serializable { @Schema(description = "MFA状态") private Boolean mfaEnable = false; + @Schema(description = "用户来源") + private Integer origin = 0; + @Schema(description = "系统变量") private List variables; }