1. 运单实体添加 货主三种类型id

2. 添加预配新增或者修改 获取货主信息功能
3. 完善预配修改 货主只编辑1个问题
4. 预配查询 添加 货主类型3个字段返回

@@ -30,12 +30,6 @@
             <artifactId>jackson-annotations</artifactId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.10.0</version>
             <version>2.10.0</version>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>com.sy</groupId>
-            <artifactId>nmms-exprot</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     </dependencies>
     <build>
     <build>
         <plugins>
         <plugins>

 package com.sunyo.wlpt.base.model;
 package com.sunyo.wlpt.base.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
+@Data
 public class AWB_AWBINFO {
 public class AWB_AWBINFO {
     private String billid;
     private String billid;
 
 
@@ -96,6 +98,14 @@ public class AWB_AWBINFO {
 
 
     private String shpcustomerid;
     private String shpcustomerid;
 
 
+    private String shpstate;
+
+    private String shpzipCode;
+
+    private String cnszipCode;
+
+    private String cnsstate;
+
     private String cnsnname;
     private String cnsnname;
 
 
     private String cnsrmobiletype;
     private String cnsrmobiletype;

@@ -64,6 +64,50 @@ public class NMMS_CUSTOM_MT2201 {
 
 
     private List<FILE> fileList;
     private List<FILE> fileList;
 
 
+    private Integer consignorId;
+
+    private Integer operatingAgentId;
+
+    private Integer bookingAgentId;
+
+    private String shipmentCargo;
+
+    private String shipType;
+
+    private String userId;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Integer getConsignorId() {
+        return consignorId;
+    }
+
+    public void setConsignorId(Integer consignorId) {
+        this.consignorId = consignorId;
+    }
+
+    public Integer getOperatingAgentId() {
+        return operatingAgentId;
+    }
+
+    public void setOperatingAgentId(Integer operatingAgentId) {
+        this.operatingAgentId = operatingAgentId;
+    }
+
+    public Integer getBookingAgentId() {
+        return bookingAgentId;
+    }
+
+    public void setBookingAgentId(Integer bookingAgentId) {
+        this.bookingAgentId = bookingAgentId;
+    }
+
     public String getUuid() {
     public String getUuid() {
         return uuid;
         return uuid;
     }
     }
@@ -279,4 +323,20 @@ public class NMMS_CUSTOM_MT2201 {
     public void setFileList(List<FILE> fileList) {
     public void setFileList(List<FILE> fileList) {
         this.fileList = fileList;
         this.fileList = fileList;
     }
     }
+
+    public String getShipmentCargo() {
+        return shipmentCargo;
+    }
+
+    public void setShipmentCargo(String shipmentCargo) {
+        this.shipmentCargo = shipmentCargo;
+    }
+
+    public String getShipType() {
+        return shipType;
+    }
+
+    public void setShipType(String shipType) {
+        this.shipType = shipType;
+    }
 }
 }

 package com.sunyo.wlpt.base.model;
 package com.sunyo.wlpt.base.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
+@Data
 public class NMMS_CUSTOM_RESPONSE {
 public class NMMS_CUSTOM_RESPONSE {
     private String id;
     private String id;
 
 
@@ -62,211 +64,5 @@ public class NMMS_CUSTOM_RESPONSE {
 
 
     private String opertel;
     private String opertel;
 
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public Date getFlightdate() {
-        return flightdate;
-    }
-
-    public void setFlightdate(Date flightdate) {
-        this.flightdate = flightdate;
-    }
-
-    public String getFlightno() {
-        return flightno;
-    }
-
-    public void setFlightno(String flightno) {
-        this.flightno = flightno == null ? null : flightno.trim();
-    }
-
-    public String getCarrier() {
-        return carrier;
-    }
-
-    public void setCarrier(String carrier) {
-        this.carrier = carrier == null ? null : carrier.trim();
-    }
-
-    public String getAwbano() {
-        return awbano;
-    }
-
-    public void setAwbano(String awbano) {
-        this.awbano = awbano == null ? null : awbano.trim();
-    }
-
-    public String getAwbhno() {
-        return awbhno;
-    }
-
-    public void setAwbhno(String awbhno) {
-        this.awbhno = awbhno == null ? null : awbhno.trim();
-    }
-
-    public String getBustype() {
-        return bustype;
-    }
-
-    public void setBustype(String bustype) {
-        this.bustype = bustype == null ? null : bustype.trim();
-    }
-
-    public Date getBusdate() {
-        return busdate;
-    }
-
-    public void setBusdate(Date busdate) {
-        this.busdate = busdate;
-    }
-
-    public BigDecimal getBusweight() {
-        return busweight;
-    }
-
-    public void setBusweight(BigDecimal busweight) {
-        this.busweight = busweight;
-    }
-
-    public Integer getBuspiece() {
-        return buspiece;
-    }
-
-    public void setBuspiece(Integer buspiece) {
-        this.buspiece = buspiece;
-    }
-
-    public String getOpertype() {
-        return opertype;
-    }
-
-    public void setOpertype(String opertype) {
-        this.opertype = opertype == null ? null : opertype.trim();
-    }
-
-    public String getCusmsgid() {
-        return cusmsgid;
-    }
-
-    public void setCusmsgid(String cusmsgid) {
-        this.cusmsgid = cusmsgid == null ? null : cusmsgid.trim();
-    }
-
-    public String getCussenderid() {
-        return cussenderid;
-    }
-
-    public void setCussenderid(String cussenderid) {
-        this.cussenderid = cussenderid == null ? null : cussenderid.trim();
-    }
-
-    public String getCusreciverid() {
-        return cusreciverid;
-    }
-
-    public void setCusreciverid(String cusreciverid) {
-        this.cusreciverid = cusreciverid == null ? null : cusreciverid.trim();
-    }
-
-    public String getCusversion() {
-        return cusversion;
-    }
-
-    public void setCusversion(String cusversion) {
-        this.cusversion = cusversion == null ? null : cusversion.trim();
-    }
-
-    public String getCusfunctioncode() {
-        return cusfunctioncode;
-    }
-
-    public void setCusfunctioncode(String cusfunctioncode) {
-        this.cusfunctioncode = cusfunctioncode == null ? null : cusfunctioncode.trim();
-    }
-
-    public Date getCusresrcvtime() {
-        return cusresrcvtime;
-    }
-
-    public void setCusresrcvtime(Date cusresrcvtime) {
-        this.cusresrcvtime = cusresrcvtime;
-    }
-
-    public Date getCusressendtime() {
-        return cusressendtime;
-    }
-
-    public void setCusressendtime(Date cusressendtime) {
-        this.cusressendtime = cusressendtime;
-    }
-
-    public String getCusrescode() {
-        return cusrescode;
-    }
-
-    public void setCusrescode(String cusrescode) {
-        this.cusrescode = cusrescode == null ? null : cusrescode.trim();
-    }
-
-    public String getCusresstatus() {
-        return cusresstatus;
-    }
-
-    public void setCusresstatus(String cusresstatus) {
-        this.cusresstatus = cusresstatus == null ? null : cusresstatus.trim();
-    }
-
-    public String getOperusername() {
-        return operusername;
-    }
-
-    public void setOperusername(String operusername) {
-        this.operusername = operusername == null ? null : operusername.trim();
-    }
-
-    public String getOpersystemname() {
-        return opersystemname;
-    }
-
-    public void setOpersystemname(String opersystemname) {
-        this.opersystemname = opersystemname == null ? null : opersystemname.trim();
-    }
-
-    public String getCusrestext() {
-        return cusrestext;
-    }
-
-    public void setCusrestext(String cusrestext) {
-        this.cusrestext = cusrestext == null ? null : cusrestext.trim();
-    }
-
-    public String getOperreason() {
-        return operreason;
-    }
-
-    public void setOperreason(String operreason) {
-        this.operreason = operreason;
-    }
-
-    public String getOperperson() {
-        return operperson;
-    }
-
-    public void setOperperson(String operperson) {
-        this.operperson = operperson;
-    }
-
-    public String getOpertel() {
-        return opertel;
-    }
-
-    public void setOpertel(String opertel) {
-        this.opertel = opertel;
-    }
+    private String userId;
 }
 }