diff --git a/backend/src/main/java/io/dataease/commons/license/F2CLicense.java b/backend/src/main/java/io/dataease/commons/license/F2CLicense.java index c2d7b5cb39..5b145233c8 100644 --- a/backend/src/main/java/io/dataease/commons/license/F2CLicense.java +++ b/backend/src/main/java/io/dataease/commons/license/F2CLicense.java @@ -1,5 +1,8 @@ package io.dataease.commons.license; +import lombok.Data; + +@Data public class F2CLicense { private String corporation; @@ -10,61 +13,6 @@ public class F2CLicense { private String edition; private Long count; - public String getCorporation() { - return corporation; - } - - public void setCorporation(String corporation) { - this.corporation = corporation; - } - - public String getExpired() { - return expired; - } - - public void setExpired(String expired) { - this.expired = expired; - } - - public String getLicenseVersion() { - return licenseVersion; - } - - public void setLicenseVersion(String licenseVersion) { - this.licenseVersion = licenseVersion; - } - - public String getProduct() { - return product; - } - - public void setProduct(String product) { - this.product = product; - } - - public Long getGenerateTime() { - return generateTime; - } - - public void setGenerateTime(Long generateTime) { - this.generateTime = generateTime; - } - - public String getEdition() { - return edition; - } - - public void setEdition(String edition) { - this.edition = edition; - } - - public Long getCount() { - return count; - } - - public void setCount(Long count) { - this.count = count; - } - - + private String serialNo; + private String remark; } \ No newline at end of file diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 3f80dc42c8..0be62dda0c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2426,7 +2426,9 @@ export default { standard: 'Standard', enterprise: 'Enterprise', support: 'Get technical support', - update_success: 'Update Success' + update_success: 'Update Success', + serial_no: 'Serial Number', + remark: 'Remark' }, template: { exit_same_template_check: 'The Same Name Exists In Now Class. Do You Want To Override It?', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 3b8b0dc4d0..934ee002fd 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2420,7 +2420,9 @@ export default { standard: '標準版', enterprise: '企業版', support: '獲取技術支持', - update_success: '更新成功' + update_success: '更新成功', + serial_no: '序列號', + remark: '備註' }, template: { exit_same_template_check: '當前分類存在相同名稱模闆,是否覆蓋?', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index fc943a5cd9..e82257b21a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2420,7 +2420,9 @@ export default { standard: '标准版', enterprise: '企业版', support: '获取技术支持', - update_success: '更新成功' + update_success: '更新成功', + serial_no: '序列号', + remark: '备注' }, template: { exit_same_template_check: '当前分类存在相同名称模板,是否覆盖?', diff --git a/frontend/src/views/system/about/index.vue b/frontend/src/views/system/about/index.vue index 68cca784c8..2afacfda47 100644 --- a/frontend/src/views/system/about/index.vue +++ b/frontend/src/views/system/about/index.vue @@ -48,6 +48,18 @@ {{ build }} + + {{ $t('about.serial_no') }} + + {{ license.serialNo }} + + + + {{ $t('about.remark') }} + + {{ license.remark }} + + @@ -137,7 +149,9 @@ export default { expired: result.license ? result.license.expired : '', count: result.license ? result.license.count : '', version: result.license ? result.license.version : '', - edition: result.license ? result.license.edition : '' + edition: result.license ? result.license.edition : '', + serialNo: result.license ? result.license.serialNo : '', + remark: result.license ? result.license.remark : '' } }, importLic(file) {