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

26 Oct, 2020 9 commits
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · cb344a96
  徐康 committed Oct 26, 2020
  
  cb344a96 Browse Files
- 退款时间间隔限制 · 44994408
  徐康 committed Oct 26, 2020
  
  44994408 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · f2e12cb3
  徐康 committed Oct 26, 2020
  
  f2e12cb3 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · fa9d1c52
  徐康 committed Oct 26, 2020
  
  fa9d1c52 Browse Files
- 加料 · cc96f90e
  徐康 committed Oct 26, 2020
  
  cc96f90e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into qa · 56400967
  刘鹏飞 committed Oct 26, 2020
  
  56400967 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 4b0b2e76
  徐康 committed Oct 26, 2020
  
  4b0b2e76 Browse Files
- 加料商品详情 · 0cd035a0
  徐康 committed Oct 26, 2020
  
  0cd035a0 Browse Files
- 自动退款改造 · 8e96c46e
  刘鹏飞 committed Oct 26, 2020
  
  8e96c46e Browse Files
23 Oct, 2020 14 commits
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 4b625f7c
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 23, 2020
  4b625f7c Browse Files
- fix 购物车存在相同的商品券，先删除后添加 · c0540a7f
  huiyang.chen committed Oct 23, 2020
  
  c0540a7f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · cd2da0d2
  xiaoer.li@freemud.com committed Oct 23, 2020
  
  cd2da0d2 Browse Files
- fix:行记录原价用促销原价 · 3c36bd8d
  xiaoer.li@freemud.com committed Oct 23, 2020
  
  3c36bd8d Browse Files
- 修改加料商品赋值 · 1623aafc
  ping.wu committed Oct 23, 2020
  
  1623aafc Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · d609ae94
  徐康 committed Oct 23, 2020
  
  d609ae94 Browse Files
- 券冲正解锁走后台任务 · 4a8e97c2
  徐康 committed Oct 23, 2020
  
  4a8e97c2 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · 8fb98ab5
  徐康 committed Oct 23, 2020
  
  8fb98ab5 Browse Files
- 券冲正解锁走后台任务 · 37398e85
  徐康 committed Oct 23, 2020
  
  37398e85 Browse Files
- Merge branch 'feature/20201022_入机键位修改_xukang' into qa · 503d2f92
  徐康 committed Oct 23, 2020
  
  503d2f92 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 84a8d13f
  徐康 committed Oct 23, 2020
  
  84a8d13f Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · 3faf5603
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  徐康 committed Oct 23, 2020
  3faf5603 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 503de50c
  huiyang.chen committed Oct 23, 2020
  
  503de50c Browse Files
- fix 麦咖啡键位 · d492d38f
  huiyang.chen committed Oct 23, 2020
  
  d492d38f Browse Files
22 Oct, 2020 17 commits
- 加料商品键位修改 · 5b116545
  ping.wu committed Oct 22, 2020
  
  5b116545 Browse Files
- 加料商品键位修改 · 6339f1a9
  ping.wu committed Oct 22, 2020
  
  6339f1a9 Browse Files
- 再来一单早餐啡常搭 · c44317af
  徐康 committed Oct 22, 2020
  
  c44317af Browse Files
- 再来一单早餐啡常搭 · 7863a967
  徐康 committed Oct 22, 2020
  
  7863a967 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 37a4929d
  徐康 committed Oct 22, 2020
  
  37a4929d Browse Files
- Merge branch 'feature/20201022_入机键位修改_xukang' into qa · 5630f14a
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 22, 2020
  5630f14a Browse Files
- 再来一单早餐啡常搭 · fe30cb7c
  徐康 committed Oct 22, 2020
  
  fe30cb7c Browse Files
- fix · d1df8eda
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  d1df8eda Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c876669d
  huiyang.chen committed Oct 22, 2020
  
  c876669d Browse Files
- fix 麦咖啡划线价多规格 · 4eae414d
  huiyang.chen committed Oct 22, 2020
  
  4eae414d Browse Files
- 升级sdk · edb47e50
  徐康 committed Oct 22, 2020
  
  edb47e50 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 72d1b14c
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  72d1b14c Browse Files
- fix · 20fbd004
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  20fbd004 Browse Files
- fix 麦咖啡划线价 · 8341784d
  huiyang.chen committed Oct 22, 2020
  
  8341784d Browse Files
- 升级购物车sdk · b36150bb
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  b36150bb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 34e255ee
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  34e255ee Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 7632bad9
  xiaoer.li@freemud.com committed Oct 22, 2020
  
  7632bad9 Browse Files