geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source 
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
This commit is contained in:
张福财
2025-11-11 15:47:20 +08:00
parent 505327b6f5 aea4737a54
commit 3f27f8ee04
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java
View File

@ -1,13 +1,10 @@
package com.xjrsoft.module.mdm.vo; package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType; import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime; import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@ -43,6 +40,7 @@ public class LngBPortPageVo {
* 所属国家和地区 * 所属国家和地区
*/ */
@ApiModelProperty("所属国家和地区") @ApiModelProperty("所属国家和地区")
@Trans(type = TransType.REGION)
private String regionCode; private String regionCode;
/** /**
* 吞吐量 * 吞吐量

1
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortVo.java
View File

@ -49,7 +49,6 @@ public class LngBPortVo {
* 所属国家和地区 * 所属国家和地区
*/ */
@ApiModelProperty("所属国家和地区") @ApiModelProperty("所属国家和地区")
@Trans(type = TransType.REGION)
private String regionCode; private String regionCode;

5
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -31,6 +31,8 @@ import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.utils.RedisUtil;
import com.xjrsoft.common.utils.TenantUtil;
import com.xjrsoft.common.utils.TreeUtil; import com.xjrsoft.common.utils.TreeUtil;
import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.common.db.utils.CommonCallUtils; import com.xjrsoft.module.common.db.utils.CommonCallUtils;
@ -70,8 +72,7 @@ public class CountryRegionController {
private final DatalogService dataService; private final DatalogService dataService;
@Autowired private final RegionDataProvider tranProvider;
private RegionDataProvider tranProvider;
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(value="LngBRegion列表(分页)") @ApiOperation(value="LngBRegion列表(分页)")