Commits · a85de71a2e692a8f6fa06a315a8834d66aebb972 · order-group-application / order-group · GitLab

04 Nov, 2020 12 commits
- Revert "fix 新增加料信息" · a85de71a
```
This reverts commit 72c21db0
```
  谌会阳 committed Nov 04, 2020
  a85de71a Browse Files
- Revert "fix 新增加料信息" · fef17012
```
This reverts commit a71aa724
```
  谌会阳 committed Nov 04, 2020
  fef17012 Browse Files
- 升级sdk · 25ae4c32
  徐康 committed Nov 04, 2020
  
  25ae4c32 Browse Files
- 买3赠1升级sdk · cb89a9ca
  徐康 committed Nov 04, 2020
  
  cb89a9ca Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · b92f2827
  徐康 committed Nov 04, 2020
  
  b92f2827 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 3d060c67
  徐康 committed Nov 04, 2020
  
  3d060c67 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 241f3997
```
 Conflicts:
	assortment-ordercenter-sdk/pom.xml
	order-application-service/pom.xml
```
  徐康 committed Nov 04, 2020
  241f3997 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 671d2a12
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  徐康 committed Nov 04, 2020
  671d2a12 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 5060d916
  徐康 committed Nov 04, 2020
  
  5060d916 Browse Files
- 升级sdk · fc02c8d3
  chongfu.liang committed Nov 04, 2020
  
  fc02c8d3 Browse Files
- Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into qa · 513ab81c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 04, 2020
  513ab81c Browse Files
- Merge branch 'feature/2.0.5-储值卡支持推配送费' into qa · cee14c19
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 04, 2020
  cee14c19 Browse Files
03 Nov, 2020 18 commits
- assortment-ordercenter-sdk修改版本号为2.0.17-RELEASE · c9fac5bb
  刘鹏飞 committed Nov 03, 2020
  
  c9fac5bb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · b903b8df
  刘鹏飞 committed Nov 03, 2020
  
  b903b8df Browse Files
- 订单退款时间增加当天时间判断，assortment-ordercenter-sdk修改版本号为2.0.16-RELEASE · 7c89847e
  刘鹏飞 committed Nov 03, 2020
  
  7c89847e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into qa · b3d81c69
  刘鹏飞 committed Nov 03, 2020
  
  b3d81c69 Browse Files
- 订单退款时间增加当天时间判断1 · 624070d3
  刘鹏飞 committed Nov 03, 2020
  
  624070d3 Browse Files
- 订单退款时间则增加当天时间判断 · 791ef37b
  刘鹏飞 committed Nov 03, 2020
  
  791ef37b Browse Files
- 订单退款时间增加当天时间判断 · 98c23583
  刘鹏飞 committed Nov 03, 2020
  
  98c23583 Browse Files
- Merge remote-tracking branch 'origin/master' · 5cf282d9
  chongfu.liang committed Nov 03, 2020
  
  5cf282d9 Browse Files
- Merge branch 'feature/2.0.4-修改支持的订单类型' · f5bcc41d
  chongfu.liang committed Nov 03, 2020
  
  f5bcc41d Browse Files
- fix · 0ac2c552
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  0ac2c552 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201103-fix新算价异常' · 2d49b3fa
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  2d49b3fa Browse Files
- fix · 53ce4c04
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  53ce4c04 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201103-fix新算价异常' · a5b0ef3d
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  a5b0ef3d Browse Files
- fix · 43cbf31b
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  43cbf31b Browse Files
- Merge remote-tracking branch 'origin/master' · 159f4cba
  chongfu.liang committed Nov 03, 2020
  
  159f4cba Browse Files
- fix · 21633612
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  21633612 Browse Files
- 集点添加为空校验 · b065e277
  chongfu.liang committed Nov 03, 2020
  
  b065e277 Browse Files
- 去除储值卡不退配送费限制 · a1f3bb9e
  chongfu.liang committed Nov 03, 2020
  
  a1f3bb9e Browse Files
02 Nov, 2020 10 commits
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'qa' · 71bc013d
```
【ID1018638】【C端服务端】活动库存接口调整对接

See merge request !7
```
  缪晖 committed Nov 02, 2020
  71bc013d Browse Files
- 【ID1018638】【C端服务端】活动库存接口调整对接 · b6044272
  缪晖 committed Nov 02, 2020
  
  b6044272 Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' into qa · 7f0c325d
  huiyang.chen committed Nov 02, 2020
  
  7f0c325d Browse Files
- fix 新增加料信息 · a71aa724
  huiyang.chen committed Nov 02, 2020
  
  a71aa724 Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' into qa · b0ed6274
  huiyang.chen committed Nov 02, 2020
  
  b0ed6274 Browse Files
- fix 新增加料信息 · 72c21db0
  huiyang.chen committed Nov 02, 2020
  
  72c21db0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · f0439a5c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 02, 2020
  f0439a5c Browse Files
- 升级assortment-ordercenter-sdk版本为2.0.16-RELEASE · 8169ef83
  刘鹏飞 committed Nov 02, 2020
  
  8169ef83 Browse Files
- 升级assortment-ordercenter-sdk版本为2.0.18-RELEASE · 3f4186b7
```
修改storecenter-sdk版本为3.1.9.RELEASE
```
  刘鹏飞 committed Nov 02, 2020
  3f4186b7 Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' into qa · 6aa9d9c9
  huiyang.chen committed Nov 02, 2020
  
  6aa9d9c9 Browse Files