Commits · 988294432511aa7350a45f7c6e7c8a0497299997 · mengmeng / pension

11 Mar, 2021 24 commits
- Merge remote-tracking branch 'origin/master' · 98829443
  lings authored Mar 11, 2021
  
  98829443
- Merge branch 'Shen' into 'master' · 2abe9abb
  mengmeng authored Mar 11, 2021
```
Shen

See merge request !14
```
  2abe9abb
- 1.订单图片关联附件上传接口完成 · d1bea003
  mlchun authored Mar 11, 2021
  
  d1bea003
- 1.订单表添加字段：坐标 · a73e2dd7
  mlchun authored Mar 11, 2021
  
  a73e2dd7
- 1.添加订单文件关联类 · 018b6ce3
  mlchun authored Mar 11, 2021
  
  018b6ce3
- 1.PensionServiceEntity、DTO修复 · a7e85a91
  mlchun authored Mar 11, 2021
  
  a7e85a91
- 1.添加老人、子女取消订单接口 · d68e945d
  mlchun authored Mar 11, 2021
  
  d68e945d
- 1.机构处理添加取消原因 · f50ca1bd
  mlchun authored Mar 11, 2021
  
  f50ca1bd
- Merge branches 'lings' and 'master' of 119.3.70.207:xie/pension into Shen · 81d8e984
  mlchun authored Mar 11, 2021
  
  81d8e984
- Merge branch 'Shen' into 'master' · 4a973dde
  zsh authored Mar 11, 2021
```
Shen

See merge request !13
```
  4a973dde
- 1.订单表添加“取消原因”字段 · 99f58bd3
  mlchun authored Mar 11, 2021
  
  99f58bd3
- 1.添加机构处理接口 · c1894ee5
  mlchun authored Mar 11, 2021
  
  c1894ee5
- 1.部分接口分页处理 · 226604c9
  mlchun authored Mar 11, 2021
  
  226604c9
- 1.添加机构处理接口 · f589bb98
  mlchun authored Mar 11, 2021
  
  f589bb98
- 1.添加查询本机构全部服务人员接口 · 52522226
  mlchun authored Mar 11, 2021
  
  52522226
- Merge remote-tracking branch 'origin/master' · 35871824
  lings authored Mar 11, 2021
  
  35871824
- 1.预约保存添加社区信息 · f757e30d
  mlchun authored Mar 11, 2021
  
  f757e30d
- admin 修改service表字段 · 13445401
  mengmeng authored Mar 11, 2021
  
  13445401
- Merge branch 'master' of 119.3.70.207:xie/pension · 148bfc90
  mengmeng authored Mar 11, 2021
  
  148bfc90
- merge · 7497e15c
  mengmeng authored Mar 11, 2021
  
  7497e15c
- Merge branch 'Shen' into 'master' · c6ba5eef
  mengmeng authored Mar 11, 2021
```
Shen

See merge request !10
```
  c6ba5eef
- 修改服务大类展示接口service表数据 · f2a77f6c
  mengmeng authored Mar 11, 2021
  
  f2a77f6c
- 1.订单列表 · cbcb3c08
  mlchun authored Mar 11, 2021
  
  cbcb3c08
- 1.机构订单接口完成 · df0e88c8
  mlchun authored Mar 11, 2021
  
  df0e88c8
10 Mar, 2021 4 commits
- 1.服务人员订单接口 · 31e4dbbc
  mlchun authored Mar 10, 2021
```
2.老人/子女订单接口（状态调整）
3.机构订单接口（未完成）
4.Constant静态类（状态调整）
```
  31e4dbbc
- 1.服务人员订单接口 · 1c07feb6
  mlchun authored Mar 10, 2021
```
2.老人/子女订单接口
3.机构订单接口（未完成）
4.Constant静态类新增订单状态
```
  1c07feb6
- 1.机构表和机构服务关系表 · e5e1ab0e
  mlchun authored Mar 10, 2021
  
  e5e1ab0e
- 1.添加机构表和机构服务关系表 · a862aded
  mlchun authored Mar 10, 2021
```
2.添加相关类
```
  a862aded
06 Feb, 2021 2 commits
- Merge branch 'master' into lings · c5c63e51
  lings authored Feb 06, 2021
  
  c5c63e51
- 服务改为树形 · d2594ab7
  lings authored Feb 06, 2021
  
  d2594ab7
04 Feb, 2021 1 commit
- Merge branches 'Shen' and 'master' of 119.3.70.207:xie/pension into Shen · 555f7347
  mlchun authored Feb 04, 2021
  
  555f7347
03 Feb, 2021 6 commits
- Merge branch 'master' into lings · 0081eee7
  lings authored Feb 03, 2021
  
  0081eee7
- 人员导入 · 6128e14e
  lings authored Feb 03, 2021
  
  6128e14e
- 社工查询 · 91b013da
  mlchun authored Feb 03, 2021
  
  91b013da
- PensionOrder更新 · 746eb729
  mlchun authored Feb 03, 2021
  
  746eb729
- fix entityName errror · 24eb707e
  mengmeng authored Feb 03, 2021
  
  24eb707e
- add cloumn & pensionCommunity module · 114e12df
  mengmeng authored Feb 03, 2021
  
  114e12df
29 Jan, 2021 3 commits
- Merge branch 'Shen' into 'master' · f7108ae9
  mengmeng authored Jan 29, 2021
```
添加老人的今日订单、全部订单、根据状态查询订单接口

See merge request !8
```
  f7108ae9
- Merge branch 'lings' into 'master' · 35fb2f66
  mengmeng authored Jan 29, 2021
```
删除重复news模块，修改服务大类及news模块

See merge request !9
```
  35fb2f66
- Merge branch 'master' into lings · 61387519
  lings authored Jan 29, 2021
  
  61387519