Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -997,4 +997,28 @@ public class SalesOrder implements Serializable {
     public void setDealerAdminId(Integer dealerAdminId) {
         this.dealerAdminId = dealerAdminId;
     }
+
+    public Integer getSalesIsSublist() {
+        return salesIsSublist;
+    }
+
+    public void setSalesIsSublist(Integer salesIsSublist) {
+        this.salesIsSublist = salesIsSublist;
+    }
+
+    public Integer getSalesBelongOrderId() {
+        return salesBelongOrderId;
+    }
+
+    public void setSalesBelongOrderId(Integer salesBelongOrderId) {
+        this.salesBelongOrderId = salesBelongOrderId;
+    }
+
+    public List<SalesOrderItem> getSuSalesOrderItemList() {
+        return suSalesOrderItemList;
+    }
+
+    public void setSuSalesOrderItemList(List<SalesOrderItem> suSalesOrderItemList) {
+        this.suSalesOrderItemList = suSalesOrderItemList;
+    }
 }