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

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

sop-api/install/mysql/init/init.sql

@@ -2027,6 +2027,7 @@ INSERT INTO `sys_privilege` VALUES (3049, '审核', 'Approve', 'LINK', 21, 1, 'A
 INSERT INTO `sys_privilege` VALUES (3050, '获取所有用户（动态表单用）接口', '/api/admin/common/get_user_list/form_widget', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (3051, '小程序签名预览', '/api/admin/common/file/preview/app', 'URL', 64, 6, 'SYS', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (3052, '考勤异常详情接口', '/api/admin/ding/exception/apply/view', 'URL', 27, 6, 'SYS', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` VALUES (1099, '二期接口', '/api/admin/tb/crm/analyse/project/count', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);
 
 INSERT INTO `sys_role` VALUES (1, NULL, '系统管理员', 1, 'ADMIN', NULL, NULL, NULL, NULL, 1, '系统角色');
 INSERT INTO `sys_role` VALUES (2, NULL, '总负责人', 1, 'PMO', NULL, NULL, 443437441441857536, 1697425600601, 1, '系统角色');

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).eq(TBCrm::getEnable,1)));
+        return ResultUtil.ok(tBCrmService.count(new QueryWrapper<TBCrm>().lambda().isNull(TBCrm::getServiceId).eq(TBCrm::getEnable, true)));
     }
 
     @ApiOperation(value = "查询项目派单信息")