diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java index 3fad7bc49..b52bed1a7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java @@ -31,8 +31,6 @@ import lombok.Data; @Data public class EmisTmsTransferTrace extends BaseEntity { - private static final long serialVersionUID = 1L; - /* id */ private Long id; /* 单号 */ @@ -41,7 +39,7 @@ public class EmisTmsTransferTrace extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastTraceDate; /* 50-签收 */ - private String lastWaybliiStatus; + private String lastWaybillStatus; /* 轨迹信息 */ private String traceInfo; /* 跟进渠道 */ diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml index 0461f0eb2..e84406a6e 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml @@ -3,12 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, bill_code, last_trace_date, last_wayblii_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_transfer_trace + select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_transfer_trace @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id, bill_code, last_trace_date, - last_wayblii_status, + last_waybill_status, trace_info, ch_id, transfer_bill_code, @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, #{billCode}, #{lastTraceDate}, - #{lastWaybliiStatus}, + #{lastWaybillStatus}, #{traceInfo}, #{chId}, #{transferBillCode}, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bill_code = #{billCode}, last_trace_date = #{lastTraceDate}, - last_wayblii_status = #{lastWaybliiStatus}, + last_waybill_status = #{lastWaybillStatus}, trace_info = #{traceInfo}, ch_id = #{chId}, transfer_bill_code = #{transferBillCode},