Merge branch 'dev-dingwf-0717' into develop

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

@@ -17,7 +17,6 @@ public class OrderRequest {
 	private String province;
 	private String city;
 	private String county;
-	private String categoryId;
 	private String brand;
 	private String type;
 	private String skill;

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

@@ -44,9 +44,6 @@ public class OrderRequestEntity {
 	@Column
 	private String county;
 
-	@Column(name = "category_id", nullable = false)
-	private String categoryId;
-
 	@Column(nullable = false)
 	private String brand;