Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/TBCrmController.java

@@ -115,10 +115,10 @@ public class TBCrmController {
     //统计待划定数量
 
     @ApiOperation(value = "统计待划定数量接口")
-    @RequestMapping(value = "/countWaitZone", method = RequestMethod.GET)
+    @RequestMapping(value = "/countWaitZone", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
     public Result countWaitZone() {
-        return ResultUtil.ok(tBCrmService.count(new QueryWrapper<TBCrm>().lambda().isNull(TBCrm::getServiceId)));
+        return ResultUtil.ok(tBCrmService.count(new QueryWrapper<TBCrm>().lambda().isNull(TBCrm::getServiceId).eq(TBCrm::getEnable, true)));
     }
 
     @ApiOperation(value = "查询项目派单信息")