Commits · c678d93e5cae162f99ff498df2f5677a0f330b89 · yangxiujun / paidan_demo · GitLab

31 Oct, 2023 15 commits
- fix：组织结构过滤查询 · c678d93e
  huangjinxin committed Oct 31, 2023
  
  c678d93e Browse Files
- fix：过滤工程师是否可用 · a569e4f2
  huangjinxin committed Oct 31, 2023
  
  a569e4f2 Browse Files
- fix: 解决代码冲突 · 1ab51cd0
  chamberone committed Oct 31, 2023
  
  1ab51cd0 Browse Files
- fix: 修复重复创建图层bug · b231066d
  chamberone committed Oct 31, 2023
  
  b231066d Browse Files
- fix：图层删除判断saas图层 · 43fdaccb
  huangjinxin committed Oct 31, 2023
  
  43fdaccb Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 370edc8a
  Ren Ping committed Oct 31, 2023
  
  370edc8a Browse Files
- fix:排班结果详情修改 · cbab9e1b
  Ren Ping committed Oct 31, 2023
  
  cbab9e1b Browse Files
- fix：图层新建不创建saas图层 · f41d75ac
  huangjinxin committed Oct 31, 2023
  
  f41d75ac Browse Files
- fix：图层删除处理 · 0dba3e7a
  huangjinxin committed Oct 31, 2023
  
  0dba3e7a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · ab7c0ad9
  huangjinxin committed Oct 31, 2023
  
  ab7c0ad9 Browse Files
- feat：批量改约指派 · 8acf8f2b
  huangjinxin committed Oct 31, 2023
  
  8acf8f2b Browse Files
- Merge branch 'develop-16542' into 'develop' · 353de893
```
refactor(容量对外接口): 参数返回

See merge request !352
```
  刘鑫 committed Oct 31, 2023
  353de893 Browse Files
- refactor(容量对外接口): 参数返回 · d96a04a1
  刘鑫 committed Oct 31, 2023
  
  d96a04a1 Browse Files
- Merge branch 'develop-16542' into 'develop' · df5ab310
```
Develop 16542

See merge request !351
```
  刘鑫 committed Oct 31, 2023
  df5ab310 Browse Files
- refactor(容量对外接口): 暂时解除时间段计算 · d9c9d3ed
  刘鑫 committed Oct 31, 2023
  
  d9c9d3ed Browse Files
30 Oct, 2023 25 commits
- refactor(容量对外接口): 添加多线程执行单日任务 · 528a7d76
  刘鑫 committed Oct 30, 2023
  
  528a7d76 Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · 4517df72
  刘鑫 committed Oct 30, 2023
  
  4517df72 Browse Files
- refactor(容量对外接口): 添加多线程执行单日任务 · 6b2a36a7
  刘鑫 committed Oct 30, 2023
  
  6b2a36a7 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · ee922485
  huangjinxin committed Oct 30, 2023
  
  ee922485 Browse Files
- fix：处理超派 · 18ec0097
  huangjinxin committed Oct 30, 2023
  
  18ec0097 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 0492d475
```
…oject.git into develop
```
  chamberone committed Oct 30, 2023
  0492d475 Browse Files
- feat: 区块删除接口更新 · 7d1e1903
  chamberone committed Oct 30, 2023
  
  7d1e1903 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 237eeaf1
  huangjinxin committed Oct 30, 2023
  
  237eeaf1 Browse Files
- feat：改约相关 · 99031334
  huangjinxin committed Oct 30, 2023
  
  99031334 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · c5885899
```
…oject.git into develop
```
  chamberone committed Oct 30, 2023
  c5885899 Browse Files
- feat: 算法支持不同的交通工具 · 334fab9e
  chamberone committed Oct 30, 2023
  
  334fab9e Browse Files
- Merge branch 'develop-16542' into 'develop' · e9d01980
```
根据工程师，品牌，技能，服务类型，时间段查询的接口

See merge request !350
```
  刘鑫 committed Oct 30, 2023
  e9d01980 Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · 9bd7c8d6
  刘鑫 committed Oct 30, 2023
  
  9bd7c8d6 Browse Files
- refactor(工程师容量): 定义根据工程师，品牌，技能，服务类型，时间段查询的接口 · 6e34767f
  刘鑫 committed Oct 30, 2023
  
  6e34767f Browse Files
- Merge branch 'develop-16542' into 'develop' · 03f784de
```
Develop 16542

See merge request !349
```
  刘鑫 committed Oct 30, 2023
  03f784de Browse Files
- refactor(工作队容量): 修改为单技能 · 58ab96d5
  刘鑫 committed Oct 30, 2023
  
  58ab96d5 Browse Files
- refactor(日期工具类): 移除无用测试代码 · 4f138650
  刘鑫 committed Oct 30, 2023
  
  4f138650 Browse Files
- Merge branch 'develop-16542' into 'develop' · d679e466
```
小队容量

See merge request !348
```
  刘鑫 committed Oct 30, 2023
  d679e466 Browse Files
- refactor(容量): 小队容量查询具体实现 · 0fe86cab
  刘鑫 committed Oct 30, 2023
  
  0fe86cab Browse Files
- refactor(容量): 移除无用转换代码 · 2f5eaebd
  刘鑫 committed Oct 30, 2023
  
  2f5eaebd Browse Files
- docs(容量): 移除迷惑性文档注释 · 1da997f9
  刘鑫 committed Oct 30, 2023
  
  1da997f9 Browse Files
- Merge branch 'develop-16542' into 'develop' · 3e5f4cc8
```
容量逻辑

See merge request !347
```
  刘鑫 committed Oct 30, 2023
  3e5f4cc8 Browse Files
- feat(容量): 定义工作队容量查询 · 5c3dbacc
  刘鑫 committed Oct 30, 2023
  
  5c3dbacc Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · c427a1bc
  刘鑫 committed Oct 30, 2023
  
  c427a1bc Browse Files
- feat(技能组容量): 技能组容量全天、半天返回 · 25d10fa9
  刘鑫 committed Oct 30, 2023
  
  25d10fa9 Browse Files