Commits · 33cbb6775832b2fb5f638db1925127f73940e15a · PeiZhen-Java / peizhen-java

16 Sep, 2023 5 commits
- bugfix · 33cbb677
  Wangmin committed Sep 16, 2023
  
  33cbb677 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f5fdbfbf
  sdif committed Sep 16, 2023
  
  f5fdbfbf Browse Files
- 用户端代码提交 · 034c09a3
  sdif committed Sep 16, 2023
  
  034c09a3 Browse Files
- 完善根据子订单ID查询数据 · 7d810b6e
  Wangmin committed Sep 16, 2023
  
  7d810b6e Browse Files
- 修改代码 · d5ff9079
  邹磊浩 committed Sep 16, 2023
  
  d5ff9079 Browse Files
15 Sep, 2023 17 commits
- 修改代码 · c8663b2b
  邹磊浩 committed Sep 15, 2023
  
  c8663b2b Browse Files
- 修改提现 · 035bee93
  Wangmin committed Sep 15, 2023
  
  035bee93 Browse Files
- 修改提现 · 1e117089
  Wangmin committed Sep 15, 2023
  
  1e117089 Browse Files
- 细节修改 · c3d65098
  Wangmin committed Sep 15, 2023
  
  c3d65098 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1f7b5fef
  Wangmin committed Sep 15, 2023
  
  1f7b5fef Browse Files
- 修改订单显示业务名称 · eb899f2e
  Wangmin committed Sep 15, 2023
  
  eb899f2e Browse Files
- 完善陪诊员完成服务 · 898df538
  Wangmin committed Sep 15, 2023
  
  898df538 Browse Files
- 修改代码 · 969ed284
  邹磊浩 committed Sep 15, 2023
  
  969ed284 Browse Files
- 提交代码 · 68cc5918
  Wangmin committed Sep 15, 2023
  
  68cc5918 Browse Files
- 用户端代码提交 · 1a06bd22
  sdif committed Sep 15, 2023
  
  1a06bd22 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ab48f67c
```
# Conflicts:
#	pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
```
  Wangmin committed Sep 15, 2023
  ab48f67c Browse Files
- 新增查看订单评价 · 533484b6
  Wangmin committed Sep 15, 2023
  
  533484b6 Browse Files
- 新增完成服务 · eee4e28a
  Wangmin committed Sep 15, 2023
  
  eee4e28a Browse Files
- 完善开始服务 · dc985e34
  Wangmin committed Sep 15, 2023
  
  dc985e34 Browse Files
- 用户端代码提交 · 92a4eb60
  sdif committed Sep 15, 2023
  
  92a4eb60 Browse Files
- 用户端代码提交 · d24f12b8
  sdif committed Sep 15, 2023
  
  d24f12b8 Browse Files
- 完善取消订单业务 · 4c486c26
  Wangmin committed Sep 15, 2023
  
  4c486c26 Browse Files
14 Sep, 2023 14 commits
- 微信支付init · da4b9159
  zhengyunfei committed Sep 14, 2023
  
  da4b9159 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 35f8479e
  Wangmin committed Sep 14, 2023
  
  35f8479e Browse Files
- 完善取消订单业务 · 64d6368e
  Wangmin committed Sep 14, 2023
  
  64d6368e Browse Files
- 修改代码 · 8afa4196
  邹磊浩 committed Sep 14, 2023
  
  8afa4196 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d1a52aea
  Wangmin committed Sep 14, 2023
  
  d1a52aea Browse Files
- 新增取消订单 · ed6444ac
  Wangmin committed Sep 14, 2023
  
  ed6444ac Browse Files
- 修改代码 · d8659897
  邹磊浩 committed Sep 14, 2023
  
  d8659897 Browse Files
- websocket完善 · 0165295b
  邹磊浩 committed Sep 14, 2023
  
  0165295b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e41ea363
```
# Conflicts:
#	pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
```
  sdif committed Sep 14, 2023
  e41ea363 Browse Files
- 用户端代码提交 · f484d3e3
  sdif committed Sep 14, 2023
  
  f484d3e3 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 4fad4a21
  邹磊浩 committed Sep 14, 2023
  
  4fad4a21 Browse Files
- 修改代码 · e513d613
  邹磊浩 committed Sep 14, 2023
  
  e513d613 Browse Files
- 新增 · 52c7c471
```
根据订单ID查询5种订单数据
```
  Wangmin committed Sep 14, 2023
  52c7c471 Browse Files
- 用户端代码提交 · 546515ac
  sdif committed Sep 14, 2023
  
  546515ac Browse Files
13 Sep, 2023 4 commits
- 新增 [陪诊员端] · 0fc0884b
```
1.需求广场
2.接单
3.根据订单ID查询详情
```
  Wangmin committed Sep 13, 2023
  0fc0884b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · bfc69186
```
# Conflicts:
#	pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
```
  Wangmin committed Sep 13, 2023
  bfc69186 Browse Files
- 新增 [陪诊员端] · ff32f400
```
1.需求广场
2.接单
3.根据订单ID查询详情
```
  Wangmin committed Sep 13, 2023
  ff32f400 Browse Files
- 用户端代码提交 · 7eb2d36f
  sdif committed Sep 13, 2023
  
  7eb2d36f Browse Files