Merge remote-tracking branch 'origin/master'

@@ -57,6 +57,8 @@ public class NMMS_CUSTOM_MT2201 {
 
 
     private AWB_AWBINFO awbinfo;
     private AWB_AWBINFO awbinfo;
 
 
+    private NMMS_CUSTOM_USER user;
+
     private List<NMMS_CUSTOM_MT2201> children;
     private List<NMMS_CUSTOM_MT2201> children;
 
 
     public String getUuid() {
     public String getUuid() {
@@ -258,4 +260,12 @@ public class NMMS_CUSTOM_MT2201 {
     public void setChildren(List<NMMS_CUSTOM_MT2201> children) {
     public void setChildren(List<NMMS_CUSTOM_MT2201> children) {
         this.children = children;
         this.children = children;
     }
     }
+
+    public NMMS_CUSTOM_USER getUser() {
+        return user;
+    }
+
+    public void setUser(NMMS_CUSTOM_USER user) {
+        this.user = user;
+    }
 }
 }

 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;
 import java.util.List;
 import java.util.List;
 
 
+@Data
 public class NMMS_CUSTOM_MT3201 {
 public class NMMS_CUSTOM_MT3201 {
     private String uuid;
     private String uuid;
 
 
@@ -54,6 +56,8 @@ public class NMMS_CUSTOM_MT3201 {
 
 
     private AWB_AWBINFO awbinfo;
     private AWB_AWBINFO awbinfo;
 
 
+    private NMMS_CUSTOM_USER user;
+
     private List<NMMS_CUSTOM_MT3201> children;
     private List<NMMS_CUSTOM_MT3201> children;
 
 
     public String getUuid() {
     public String getUuid() {