From 145034b9085096b770a4f7f9e5a83d623930ec7d Mon Sep 17 00:00:00 2001 From: ziin Date: Mon, 13 Oct 2025 17:55:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=BB=E6=92=AD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=91=98=E5=B7=A5=E4=B8=BB=E6=92=AD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=8B=B1=E6=96=87=E5=9B=BD=E5=AE=B6=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/employeehosts/vo/EmployeeHostsPageReqVO.java | 3 +++ .../admin/employeehosts/vo/EmployeeHostsRespVO.java | 3 +++ .../admin/employeehosts/vo/EmployeeHostsSaveReqVO.java | 3 +++ .../controller/admin/newhosts/vo/NewHostsPageReqVO.java | 3 +++ .../tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java | 4 ++++ .../tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java | 2 ++ .../module/tkdata/dal/dataobject/newhosts/NewHostsDO.java | 2 ++ .../resources/mapper/employeehosts/EmployeeHostsMapper.xml | 5 +++-- .../src/main/resources/mapper/newhosts/NewHostsMapper.xml | 2 +- 9 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java index b3a6043..6d9c10a 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java @@ -133,4 +133,7 @@ public class EmployeeHostsPageReqVO extends PageParam { @Schema(description = "旗帜") private String flag; + + @Schema(description = "国家英文名", example = "United States") + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java index 96253fc..505b037 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java @@ -79,4 +79,7 @@ public class EmployeeHostsRespVO { @Schema(description = "旗帜") private String flag; + + @Schema(description = "国家英文名", example = "United States") + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java index 0fe4765..50549b5 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java @@ -53,4 +53,7 @@ public class EmployeeHostsSaveReqVO { @Schema(description = "旗帜") private String flag; + + @Schema(description = "国家英文名", example = "United States") + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java index b4ce062..435886d 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java @@ -145,4 +145,7 @@ public class NewHostsPageReqVO extends PageParam { @Schema(description = "旗帜") private String flag; + + @Schema(description = "国家英文名", example = "United States") + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java index 7a6faba..f6c13ea 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java @@ -90,4 +90,8 @@ public class NewHostsRespVO { @Schema(description = "旗帜") @ExcelProperty("旗帜") private String flag; + + @Schema(description = "国家英文名", example = "United States") + @ExcelProperty("国家英文名") + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java index 23daf73..e5e0302 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java @@ -85,4 +85,6 @@ public class EmployeeHostsDO extends BaseDO { private Long tenantId; private String flag; + + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/newhosts/NewHostsDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/newhosts/NewHostsDO.java index 03f98c5..8a60cf2 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/newhosts/NewHostsDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/newhosts/NewHostsDO.java @@ -85,4 +85,6 @@ public class NewHostsDO extends TenantBaseDO { * 是否建联 */ private Byte operationStatus; + + private String countryEng; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index b004103..aa5b37c 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -111,7 +111,8 @@ select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum, - yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time,ns.flag + yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time,ns.flag,ns.country_eng from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name WHERE tenant_id = #{req.tenantId,jdbcType=BIGINT} and deleted = 0 diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml index 9595d3b..0b9d204 100644 --- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml @@ -12,7 +12,7 @@