Commits · 2fae346c2232aed18049937373e500addaaa377d · yangxiujun / paidan_demo · GitLab

13 Jul, 2023 40 commits
- fix: 替换序列化 · 2fae346c
  chamberone committed Jul 13, 2023
  
  2fae346c
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · f6bbc580
```
…oject.git into develop
```
  chamberone committed Jul 13, 2023
  f6bbc580 Browse Files
- fix: 序列化问题修复 · 5ed93c74
  chamberone committed Jul 13, 2023
  
  5ed93c74 Browse Files
- Merge branch 'dev_rescheduling0713' into 'develop' · b3c455ff
```
修改

See merge request !228
```
  王力 committed Jul 13, 2023
  b3c455ff Browse Files
- 修改 · 0cfc77bb
  wangli committed Jul 13, 2023
  
  0cfc77bb Browse Files
- Merge branch 'dev_rescheduling0713' into 'develop' · 736ba016
```
Dev rescheduling0713

See merge request !227
```
  王力 committed Jul 13, 2023
  736ba016 Browse Files
- 新增订单改约实现 · 7f7199a4
  wangli committed Jul 13, 2023
  
  7f7199a4 Browse Files
- 新增datetimeString2LocalDateTime · 4bc4b847
  wangli committed Jul 13, 2023
  
  4bc4b847 Browse Files
- 新增订单改约接口 · 6c761ee4
  wangli committed Jul 13, 2023
  
  6c761ee4 Browse Files
- fix: 序列化问题修复 · a85b65a7
  chamberone committed Jul 13, 2023
  
  a85b65a7 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · ca625cb2
```
…oject.git into develop
```
  chamberone committed Jul 13, 2023
  ca625cb2 Browse Files
- fix: 序列化错误 · 970bf042
  chamberone committed Jul 13, 2023
  
  970bf042 Browse Files
- fix: fix compile error · 0ff0fc7b
  chamberone committed Jul 13, 2023
  
  0ff0fc7b Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · eab675f9
```
…oject.git into develop
```
  chamberone committed Jul 13, 2023
  eab675f9 Browse Files
- fix: add logs · 862cc249
  chamberone committed Jul 13, 2023
  
  862cc249 Browse Files
- Merge branch 'dev_bugfix_order_assign0713' into 'develop' · fb819b78
```
修改

See merge request !226
```
  王力 committed Jul 13, 2023
  fb819b78 Browse Files
- 修改 · f3739024
  wangli committed Jul 13, 2023
  
  f3739024 Browse Files
- fix: 修复错误 · 4f355a73
  chamberone committed Jul 13, 2023
  
  4f355a73 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 30360e23
```
…oject.git into develop
```
  chamberone committed Jul 13, 2023
  30360e23 Browse Files
- fix: add logs · df9d1d83
  chamberone committed Jul 13, 2023
  
  df9d1d83 Browse Files
- Merge branch 'feature-dispatch-zx' into develop · f5cafcdf
  张晓 committed Jul 13, 2023
  
  f5cafcdf Browse Files
- fix bugs · dc93d5cc
  张晓 committed Jul 13, 2023
  
  dc93d5cc Browse Files
- fix: 测试接口 · 2484e2b3
  chamberone committed Jul 13, 2023
  
  2484e2b3 Browse Files
- fix: 微服务调用修复 · c022ac04
  chamberone committed Jul 13, 2023
  
  c022ac04 Browse Files
- fix: user服务微服务调用修复 · 58cbee4e
  chamberone committed Jul 13, 2023
  
  58cbee4e
- fix: fix runtime error · 421157ba
  chamberone committed Jul 13, 2023
  
  421157ba Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · a460dcf7
```
…oject.git into develop
```
  chamberone committed Jul 13, 2023
  a460dcf7 Browse Files
- feat: 添加组织结构相关逻辑 · 32808101
  chamberone committed Jul 13, 2023
  
  32808101 Browse Files
- Merge branch 'dev_scheduleresult0713' into 'develop' · 80dfe85a
```
修改

See merge request !225
```
  王力 committed Jul 13, 2023
  80dfe85a Browse Files
- 修改 · 06e0ac64
  wangli committed Jul 13, 2023
  
  06e0ac64 Browse Files
- Merge branch 'dev_scheduleresult0713' into 'develop' · e2a7eb8e
```
Dev scheduleresult0713

See merge request !224
```
  王力 committed Jul 13, 2023
  e2a7eb8e Browse Files
- 修改 · 111e7ddd
  wangli committed Jul 13, 2023
  
  111e7ddd Browse Files
- date类型由string2LocalDate · 8369dfe3
  wangli committed Jul 13, 2023
  
  8369dfe3 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · a2fe7924
  丁伟峰 committed Jul 13, 2023
  
  a2fe7924 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · a17822ee
  丁伟峰 committed Jul 13, 2023
  
  a17822ee Browse Files
- Null异常，增加日志跟踪分析 · aa88abae
  丁伟峰 committed Jul 13, 2023
  
  aa88abae Browse Files
- Merge branch 'feature-dispatch-zx' into develop · 5c7d47dd
  张晓 committed Jul 13, 2023
  
  5c7d47dd Browse Files
- 增加order_event ,order_log 写记录 · e6abfb74
  张晓 committed Jul 13, 2023
  
  e6abfb74 Browse Files
- Merge branch 'dev_engineer_bussiness' into 'develop' · fd91bff0
```
修复bussiness相关接口值

See merge request !223
```
  王力 committed Jul 13, 2023
  fd91bff0 Browse Files
- 修复bussiness相关接口值 · 28408fb2
  wangli committed Jul 13, 2023
  
  28408fb2 Browse Files