Merge branch 'feature-dispatch-zx' into develop

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

@@ -45,9 +45,6 @@ public class OrderRequest implements Serializable {
 
 
     private String county;
     private String county;
 
 
-    @Column(name = "category_id")
-    private String categoryId;
-
     private String brand;
     private String brand;
 
 
     private String type;
     private String type;

project-dispatch/src/test/java/com/dituhui/pea/dispatch/SolveServiceTest.java

@@ -75,7 +75,7 @@ class SolveServiceTest {
 
 
         DispatchSolution solution = solver.solve(problem);
         DispatchSolution solution = solver.solve(problem);
         solveService.saveSolutionWrp(solution);
         solveService.saveSolutionWrp(solution);
-        extractService.extractDispatchToOrder(groupId, batchNo, true);
+        extractService.extractDispatchToOrder(groupId, batchNo, false);
 
 
 
 
         log.info("testAsync done");
         log.info("testAsync done");