Commits · 35c93ce863b33a19e8fdb1e433451a6c3bb918c7 · yangxiujun / paidan_demo · GitLab

27 Oct, 2023 6 commits
- Merge remote-tracking branch 'origin/develop' into develop · 35c93ce8
  Ren Ping committed Oct 27, 2023
  
  35c93ce8 Browse Files
- fix:消息模块 · 77e30e61
  Ren Ping committed Oct 27, 2023
  
  77e30e61 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 4e4b2ac6
  huangjinxin committed Oct 27, 2023
  
  4e4b2ac6 Browse Files
- feat:一家多单，超派，特殊时间段相关 · 5c875dce
  huangjinxin committed Oct 27, 2023
  
  5c875dce Browse Files
- fix:消息模块 · e9c0347f
  Ren Ping committed Oct 27, 2023
  
  e9c0347f Browse Files
- feat:消息模块开发 · c3d0185d
  Ren Ping committed Oct 27, 2023
  
  c3d0185d Browse Files
26 Oct, 2023 19 commits
- feat:消息模块开发 · 33a38111
  Ren Ping committed Oct 26, 2023
  
  33a38111 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · d3d25664
  huangjinxin committed Oct 26, 2023
  
  d3d25664 Browse Files
- feat: 修复dao方法 · f48267f1
  chamberone committed Oct 26, 2023
  
  f48267f1 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 0811506e
```
…oject.git into develop
```
  chamberone committed Oct 26, 2023
  0811506e Browse Files
- feat: 更新dao方法 · 14164db2
  chamberone committed Oct 26, 2023
  
  14164db2 Browse Files
- feat: 修复dao方法 · 6c47fdc5
  chamberone committed Oct 26, 2023
  
  6c47fdc5 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 6a8c296f
  刘鑫 committed Oct 26, 2023
  
  6a8c296f Browse Files
- feat: 调整对接saas区划表 · 1795b64d
  chamberone committed Oct 26, 2023
  
  1795b64d Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 025f1c3c
  刘鑫 committed Oct 26, 2023
  
  025f1c3c Browse Files
- test: 容量接口返回示例更改 · 1132e3da
  刘鑫 committed Oct 26, 2023
  
  1132e3da Browse Files
- feat(PEA对外接口): 创建预约工单 · 7a5521ef
```
增加是否指定某个工程师/是否排除某个工程师
```
  刘鑫 committed Oct 26, 2023
  7a5521ef Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 38e13584
  huangjinxin committed Oct 26, 2023
  
  38e13584 Browse Files
- fix:格式化代码 · 6e04d794
  huangjinxin committed Oct 26, 2023
  
  6e04d794 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 76567c40
```
…oject.git into develop
```
  chamberone committed Oct 26, 2023
  76567c40 Browse Files
- feat: 去掉自动生成订单逻辑 · 038fa185
  chamberone committed Oct 26, 2023
  
  038fa185 Browse Files
- feat:工程师工作地址和首选工作地址相关处理 · b9ee0b92
  huangjinxin committed Oct 26, 2023
  
  b9ee0b92 Browse Files
- feat:消息模块开发 · 43c2dae6
  Ren Ping committed Oct 26, 2023
  
  43c2dae6 Browse Files
- feat:消息模块开发 · d424af68
  Ren Ping committed Oct 26, 2023
  
  d424af68 Browse Files
- feat:工作队新增，修改，添加工作起止时间字段和逻辑 · 41fb3659
  huangjinxin committed Oct 26, 2023
  
  41fb3659 Browse Files
25 Oct, 2023 15 commits
- Merge remote-tracking branch 'origin/develop' into develop · 8397be7b
  huangjinxin committed Oct 25, 2023
  
  8397be7b Browse Files
- feat:组织机构网点导入代码 · 3be86770
  huangjinxin committed Oct 25, 2023
  
  3be86770 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · bb956ce9
  刘鑫 committed Oct 25, 2023
  
  bb956ce9 Browse Files
- feat(BEAN 接口): 工单改约、工单取消 · 66af4c89
```
参数变更
```
  刘鑫 committed Oct 25, 2023
  66af4c89 Browse Files
- test(BEAN 接口联调): 增加接口测试逻辑 · eff22bf1
  刘鑫 committed Oct 25, 2023
  
  eff22bf1 Browse Files
- feat:消息模块开发 · cffcb177
  Ren Ping committed Oct 25, 2023
  
  cffcb177 Browse Files
- feat:消息模块开发 · b86cbc10
  Ren Ping committed Oct 25, 2023
  
  b86cbc10 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · c9e208f8
```
…oject.git into develop
```
  chamberone committed Oct 25, 2023
  c9e208f8 Browse Files
- fix: 解决字段为空错误 · 37af2b6a
  chamberone committed Oct 25, 2023
  
  37af2b6a Browse Files
- feat:提交组织同步相关，防止冲突 · 8d4244f9
  huangjinxin committed Oct 25, 2023
  
  8d4244f9
- Merge remote-tracking branch 'origin/develop' into develop · 26c731d8
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java
```
  刘鑫 committed Oct 25, 2023
  26c731d8 Browse Files
- test(BEAN 接口联调): 增加接口测试逻辑 · 6d967ac0
  刘鑫 committed Oct 25, 2023
  
  6d967ac0 Browse Files
- fix: 解决工单查询接口错误 · c39bae2f
  chamberone committed Oct 25, 2023
  
  c39bae2f Browse Files
- fix: 添加返回结果接收对象 · 06f5e587
  刘鑫 committed Oct 25, 2023
  
  06f5e587 Browse Files
- fix: 添加set get · a30abe52
  刘鑫 committed Oct 25, 2023
  
  a30abe52 Browse Files