Merge branch 'release-fix' of...

Merge branch 'release-fix' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into release-fix

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseLineMapper.java

@@ -86,6 +86,8 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
             "ew_dest.qianzhui as dest_qianzhui,",
             "ew_dest_country.title_zh as dest_country_title_zh,",
             "ew_dest_country.title_en as dest_country_title_en,",
+            "ew_dest_city.title_zh as dest_city_title_zh,",
+            "ew_dest_city.title_en as dest_city_title_en,",
             "ew_dest.volume as dest_volume,",
             "ew_dest.rent_free_days as dest_rent_free_days,",
             "ew_dest.lock_recipient_days as dest_lock_recipient_days,",
@@ -103,6 +105,8 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
             "ON ewl.dest_warehouse_id = ew_dest.id",
             "JOIN ecw_region ew_dest_country",
             "ON ew_dest_country.id = ew_dest.guojia",
+            "JOIN ecw_region ew_dest_city",
+            "ON ew_dest_city.id = ew_dest.shi",
             "WHERE ",
             " ewl.id = #{lineId}"
     })

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dto/LogisticsInfoDto.java

@@ -32,6 +32,12 @@ public class LogisticsInfoDto {
     @ApiModelProperty(value = "始发地国家英文名称")
     private String startCountryTitleEn;
 
+//    @ApiModelProperty(value = "始发地城市中文名称")
+//    private String startCityTitleZh;
+//
+//    @ApiModelProperty(value = "始发地城市英文名称")
+//    private String startCityTitleEn;
+
     @ApiModelProperty(value = "始发地仓库容量")
     private String startVolume;
 
@@ -76,6 +82,12 @@ public class LogisticsInfoDto {
     @ApiModelProperty(value = "目的地国家英文名称")
     private String destCountryTitleEn;
 
+    @ApiModelProperty(value = "目的地城市中文名称")
+    private String destCityTitleZh;
+
+    @ApiModelProperty(value = "目的地城市英文名称")
+    private String destCityTitleEn;
+
     @ApiModelProperty(value = "目的地仓库容量")
     private String destVolume;