Merge branch 'dev_engineer_work_dynamics' into 'develop'

数据库表结构变更

See merge request !233

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

@@ -4,7 +4,8 @@ import lombok.Data;
 
 
 @Data
 @Data
 public class OrgWarehouseInfo {
 public class OrgWarehouseInfo {
-	private Integer warehouseId;
+	private long id;
+	private String warehouseId;
 	private String warehouseName;
 	private String warehouseName;
 	private String branchId;
 	private String branchId;
 	private String cityCode;
 	private String cityCode;