押运员表修改

src/main/java/com/aoyang/tms/entity/TruckEscort.java

@@ -31,7 +31,7 @@ public class TruckEscort implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户id（tms.driver.user_id）")
-    @TableField("user_id")
+    @TableField("escort_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 

src/main/resources/mapper/TruckEscortMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckEscort">
-        <id column="user_id" property="userId" />
+        <id column="escort_id" property="escortId" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
         <result column="org_id" property="orgId" />
@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        truck_id, car_number, org_id, org_name, org_short_name, mobile, user_id, escort_name, note, creater, creater_name, create_date, updater, updater_name, update_date
+        escort_id, escort_name,truck_id, car_number, org_id, org_name, org_short_name, mobile,  note, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>