From 79e0ef095575010c18b589365c7aa97216235a57 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 10 Jul 2025 09:08:30 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=92=8C=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E7=82=B9=E4=BA=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hzs/system/base/dto/CountryDTO.java | 6 ------ .../com/hzs/system/common/dto/MemberDataDTO.java | 4 ---- .../base/service/impl/MemberInfoServiceImpl.java | 1 - .../java/com/hzs/member/base/vo/MemberInfoVO.java | 4 ---- .../common/provider/CommonServiceProvider.java | 1 - .../hzs/common/domain/system/base/BdCountry.java | 13 ------------- 6 files changed, 29 deletions(-) diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java index 3fc2531e..8b36ffd0 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CountryDTO.java @@ -67,10 +67,4 @@ public class CountryDTO implements Serializable { */ private Integer languages; - - /** - * 国家所属语种 - */ - private String lightName; - } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java index 87ccb2e4..f2b53f3e 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/MemberDataDTO.java @@ -52,10 +52,6 @@ public class MemberDataDTO implements Serializable { * 结算国家方形国旗 */ private String settleCountrySquareIcon; - /** - * 结算国家点亮名称 - */ - private String settleCountryLightName; /** * 结算国家地图 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java index 317a250c..bb363a3b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/MemberInfoServiceImpl.java @@ -74,7 +74,6 @@ public class MemberInfoServiceImpl implements IMemberInfoService { .pkSettleCountryVal(pkSettleCountryVal) .settleCountryCircularIcon(memberDataDTO.getSettleCountryCircularIcon()) .settleCountrySquareIcon(memberDataDTO.getSettleCountrySquareIcon()) - .settleCountryLightName(memberDataDTO.getSettleCountryLightName()) .settleCountryImg(memberDataDTO.getSettleCountryImg()) .pkGradeId(cuMember.getPkSettleGrade()) .pkGrade(memberDataDTO.getPkGrade()) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java index df24a026..082e23d6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberInfoVO.java @@ -68,10 +68,6 @@ public class MemberInfoVO { * 结算国家方形国旗 */ private String settleCountrySquareIcon; - /** - * 结算国家点亮名称 - */ - private String settleCountryLightName; /* * 结算国家地图 */ diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java index 7335a001..1138d010 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java @@ -54,7 +54,6 @@ public class CommonServiceProvider implements ICommonServiceApi { memberDataDTO.setPkSettleCountryVal(bdSettleCountry.getShortName()); memberDataDTO.setSettleCountryCircularIcon(bdSettleCountry.getNationalFlag1()); memberDataDTO.setSettleCountrySquareIcon(bdSettleCountry.getNationalFlag2()); - memberDataDTO.setSettleCountryLightName(bdSettleCountry.getLightName()); memberDataDTO.setSettleCountryImg(bdSettleCountry.getImg()); memberDataDTO.setPkSettleCountryVal(bdSettleCountry.getShortName()); } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java index 94b61223..12737fac 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCountry.java @@ -11,12 +11,7 @@ import lombok.Data; import lombok.experimental.Accessors; /** - *

* 国家表 - *

- * - * @author hzs - * @since 2022-08-03 */ @Data @Accessors(chain = true) @@ -55,7 +50,6 @@ public class BdCountry implements Serializable { private String codeThree; - /** * 国旗 */ @@ -133,13 +127,6 @@ public class BdCountry implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date effectiveDate; - /** - * 国家所属语种 - */ - @TableField("LIGHT_NAME") - private String lightName; - - /** * 国家图片 */