Commits · 123f44acf1a50050ef25b1472e4913e9eb2af03f · jenkins / order-group · GitLab

17 Mar, 2020 7 commits
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 123f44ac
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 17, 2020
  123f44ac Browse Files
- 接单超时时间修改 · 3691499c
  ping.wu committed Mar 17, 2020
  
  3691499c Browse Files
- 接单超时时间判断修改 · fc9e2e0a
  ping.wu committed Mar 17, 2020
  
  fc9e2e0a Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · ca79e45c
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	ordercenter-sdk/readme.md
```
  ping.wu committed Mar 17, 2020
  ca79e45c Browse Files
- 预约单接单接口增加预约任务，创建订单预约任务修改 · 34721912
  ping.wu committed Mar 17, 2020
  
  34721912 Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 7570fa8e
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 17, 2020
  7570fa8e Browse Files
- 创建配送单预约时间判断错误修改 · 9a3b33f2
  ping.wu committed Mar 17, 2020
  
  9a3b33f2 Browse Files
16 Mar, 2020 4 commits
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · b9923ffd
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 16, 2020
  b9923ffd Browse Files
- 创建配送单预约时间错误修改时间，超时自动接单调整 · 16c4f92a
  ping.wu committed Mar 16, 2020
  
  16c4f92a Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 65add252
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 16, 2020
  65add252 Browse Files
- 取餐时间判断修改 · 835dec78
  ping.wu committed Mar 16, 2020
  
  835dec78 Browse Files
13 Mar, 2020 5 commits
- Merge remote-tracking branch 'remotes/origin/feature/15_配送信息remark' into develop · 193c4aaa
  family committed Mar 13, 2020
  
  193c4aaa Browse Files
- Add:配送回调补全remark · 549d70aa
  family committed Mar 13, 2020
  
  549d70aa Browse Files
- Add:配送回调补全remark · 271a87d2
  family committed Mar 13, 2020
  
  271a87d2 Browse Files
- Merge branch 'develop' of… · f99e6ab8
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  姜海波 committed Mar 13, 2020
  f99e6ab8 Browse Files
- 订单计算满额减配送费 · 483c8b0b
  姜海波 committed Mar 13, 2020
  
  483c8b0b Browse Files
12 Mar, 2020 12 commits
- 微信订单上传换队列 · 6f2465e0
  shuhu.hou committed Mar 12, 2020
  
  6f2465e0 Browse Files
- 微信订单上传换队列 · 2412d9fa
  shuhu.hou committed Mar 12, 2020
  
  2412d9fa Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 6478fb55
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 12, 2020
  6478fb55 Browse Files
- 未营业可以下预约单调整 · bd1d4b3e
  ping.wu committed Mar 12, 2020
  
  bd1d4b3e Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 3fad4a7d
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 12, 2020
  3fad4a7d Browse Files
- 预约单任务处理时间，回调时间，超时时间修改 · f63d9d0b
  ping.wu committed Mar 12, 2020
  
  f63d9d0b Browse Files
- Merge branch 'feature/20200302_动态队列扩充' · 24890679
  shuhu.hou committed Mar 12, 2020
  
  24890679 Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 6657a42e
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 12, 2020
  6657a42e Browse Files
- 预约单处理时间与任务时间调整2 · 3c0a4c1d
  ping.wu committed Mar 12, 2020
  
  3c0a4c1d Browse Files
- Merge branch 'feature/20200309_1.9.1415_TAPD1007005' · a5af3940
  huvchao@126.com committed Mar 12, 2020
  
  a5af3940 Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · ff84178a
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 12, 2020
  ff84178a Browse Files
- 预约单处理时间与任务时间调整 · a76b4ec9
  ping.wu committed Mar 12, 2020
  
  a76b4ec9 Browse Files
11 Mar, 2020 7 commits
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 1e1f7b80
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 11, 2020
  1e1f7b80 Browse Files
- 外卖单取消配送 · 0e41142d
  ping.wu committed Mar 11, 2020
  
  0e41142d Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · c9b30d8f
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Mar 11, 2020
  c9b30d8f Browse Files
- 预约时间判断修改 · 5c6431d0
  ping.wu committed Mar 11, 2020
  
  5c6431d0 Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 3e59d74b
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 11, 2020
  3e59d74b Browse Files
- 报错修改 · 531b9d59
  ping.wu committed Mar 11, 2020
  
  531b9d59 Browse Files
- 微信订单上传换队列 · 171229af
  shuhu.hou committed Mar 11, 2020
  
  171229af Browse Files
10 Mar, 2020 5 commits
- sdk版本修改 · bd999092
  ping.wu committed Mar 10, 2020
  
  bd999092 Browse Files
- 预约单修改 · 49a7bfa5
  ping.wu committed Mar 10, 2020
  
  49a7bfa5 Browse Files
- 隔天预约单调整 · 07ea3939
  ping.wu committed Mar 10, 2020
  
  07ea3939 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 87246edb
  shuhu.hou committed Mar 10, 2020
  
  87246edb Browse Files
- Merge branch 'feature/20200310_微信订单上传金额修复' into develop · 790c18ec
  shuhu.hou committed Mar 10, 2020
  
  790c18ec Browse Files