Merge branch 'dev_engineer_work_dynamics' into 'develop'

修改

See merge request !232

project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfo.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 @Data
 public class OrgWarehouseInfo {
 public class OrgWarehouseInfo {
 	private Integer warehouseId;
 	private Integer warehouseId;
-	private String warehouseNname;
+	private String warehouseName;
 	private String branchId;
 	private String branchId;
 	private String cityCode;
 	private String cityCode;
 	private String address;
 	private String address;