Merge remote-tracking branch 'origin/master'

railway-business/src/main/java/com/railway/business/baseinfo/domain/BaseStation.java

@@ -18,6 +18,9 @@ public class BaseStation extends BaseEntity {
   @ApiModelProperty(value = "主键", hidden = true)
   private Long stationId;
 
+  @ApiModelProperty(value = "线路id")
+  private Long lineId;
+
   @ApiModelProperty(value = "区间站场名称")
   @Length(min = 1, max = 64, message = "【区间站场名称】长度必须介于 {min} 和 {max} 之间")
   private String stationName;

railway-business/src/main/resources/mapper/baseinfo/BaseStationMapper.xml

@@ -5,6 +5,7 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BaseStation">
     <result column="station_id" property="stationId"/>
+    <result column="line_id" property="lineId"/>
     <result column="station_name" property="stationName"/>
     <result column="station_type" property="stationType"/>
     <result column="order_num" property="orderNum"/>
@@ -17,6 +18,7 @@
 
   <sql id="Base_Column_List">
     t.station_id,
+    t.line_id,
     t.station_name,
     t.station_type,
     t.order_num,
@@ -33,6 +35,9 @@
       <if test='null != stationName'>
         station_name,
       </if>
+      <if test='null != lineId'>
+        line_id,
+      </if>
       <if test='null != stationType'>
         station_type,
       </if>
@@ -59,6 +64,9 @@
       <if test='null != stationName'>
         #{stationName},
       </if>
+      <if test='null != lineId'>
+        #{lineId},
+      </if>
       <if test='null != stationType'>
         #{stationType},
       </if>
@@ -93,6 +101,7 @@
     UPDATE base_station
     <set>
       <if test='null != stationName'>station_name = #{stationName},</if>
+      <if test='null != lineId'>line_id = #{lineId},</if>
       <if test='null != stationType'>station_type = #{stationType},</if>
       <if test='null != orderNum'>order_num = #{orderNum},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>