Merge remote-tracking branch 'origin/dev-hkl' into dev

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/entity/SectionStationMap.java

@@ -61,9 +61,6 @@ public class SectionStationMap {
     @ApiModelProperty("所属线别id")
     private String stationLineAliasId;
 
-    @ApiModelProperty("所属线别名称")
-    private String stationLineAliasName;
-
     @ApiModelProperty(value = "起始里程")
     private BigDecimal stationStartingMileage;
 

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/service/impl/SubwaySectionServiceImpl.java

@@ -91,6 +91,7 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
             sectionStationMap.setStationId(trainStation.getId()); // 车站id
             sectionStationMap.setStationName(trainStation.getStationName()); // 车站名称
             sectionStationMap.setLightRailId(dto.getLightRailId());
+            sectionStationMap.setStationLineAliasId(dto.getLineAliasId());//线别id
             sectionStationMap.setStationStartingMileage(trainStation.getStartingMileage());// 车站起始里程
             sectionStationMap.setStationCenterMileage(trainStation.getCenterMileage());// 车站中心里程
             sectionStationMap.setStationEndMileage(trainStation.getEndMileage());// 车站结束里程