Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java

@@ -0,0 +1,67 @@
+package com.logpm.distribution.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PushInstallDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+	private String name;
+
+
+	private String tel;
+
+
+	private String address;
+
+
+	private String balance_people;
+
+
+	private String balance_type;
+
+
+	private String balance_name;
+
+
+	private List<Order> order;
+
+	private List<OrderDetail> order_detail;
+
+	@Data
+	public static class Order implements Serializable{
+		private static final long serialVersionUID = 1L;
+
+		private String waybill_no;
+		private String all_num;
+		private String end_num;
+		private String order_no;
+
+	}
+
+
+
+	@Data
+	public static class OrderDetail implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private String waybill_no;
+		private String package_code;
+		private String level1_type;
+		private String level2_type;
+		private String level3_type;
+		private String materials;
+		private String order_no;
+		private String number;
+
+
+	}
+
+
+
+}