Commits · 952cc13cccb31bf5efe28aef57f8ab6e137282bb · order-group-application / order-group · GitLab

04 Aug, 2020 7 commits
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 952cc13c
  chongfu.liang committed Aug 04, 2020
  
  952cc13c Browse Files
- 加料商品开发 · ceab59d5
  chongfu.liang committed Aug 04, 2020
  
  ceab59d5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · e474519f
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  e474519f Browse Files
- 增加小料数量 · bba6fbd5
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  bba6fbd5 Browse Files
- 升级SDK · 9889fa0e
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  9889fa0e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 634b044c
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 04, 2020
  634b044c Browse Files
- MaterialId->spuId 及将小料价格合到主商品行记录上 · 71b0f4bb
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  71b0f4bb Browse Files
03 Aug, 2020 8 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · e138d29d
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 03, 2020
  e138d29d Browse Files
- 促销计算代码优化 · 2b27a2f3
  ping.wu committed Aug 03, 2020
  
  2b27a2f3 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 19ca47e6
  chongfu.liang committed Aug 03, 2020
  
  19ca47e6 Browse Files
- 加料商品开发 · 8716be4b
  chongfu.liang committed Aug 03, 2020
  
  8716be4b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 7a319b7e
  xiaoer.li@freemud.com committed Aug 03, 2020
  
  7a319b7e Browse Files
- fix · dacabbca
  xiaoer.li@freemud.com committed Aug 03, 2020
  
  dacabbca Browse Files
- Merge branch 'feature-2020/8/3-1.9.33-会阳' into develop · 912c1c32
  谌会阳 committed Aug 03, 2020
  
  912c1c32 Browse Files
- 外卖和堂食退款设置 · fccce770
  谌会阳 committed Aug 03, 2020
  
  fccce770 Browse Files
01 Aug, 2020 4 commits
- 升级购物车sdk · d4047293
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  d4047293 Browse Files
- 升级购物车sdk · 29d8b0e6
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  29d8b0e6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 72794160
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 01, 2020
  72794160 Browse Files
- fix:originalAmount · 15bc70d9
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  15bc70d9 Browse Files
30 Jul, 2020 17 commits
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 7fe23022
  chongfu.liang committed Jul 30, 2020
  
  7fe23022 Browse Files
- 加料商品开发 · 26198180
  chongfu.liang committed Jul 30, 2020
  
  26198180 Browse Files
- Merge branch '20200729_订单完成时送集点_zhanghongtao' of… · cd81c43b
```
Merge branch '20200729_订单完成时送集点_zhanghongtao' of gitlab.freemud.com:order-group-application/order-group
```
  张洪涛 committed Jul 30, 2020
  cd81c43b Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · a8fbcfc9
  chongfu.liang committed Jul 30, 2020
  
  a8fbcfc9 Browse Files
- 加料商品开发 · 848c516f
  chongfu.liang committed Jul 30, 2020
  
  848c516f Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 1dd62814
  chongfu.liang committed Jul 30, 2020
  
  1dd62814 Browse Files
- 加料商品开发 · fb48d5fc
  chongfu.liang committed Jul 30, 2020
  
  fb48d5fc Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · c72d8425
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  c72d8425 Browse Files
- 去掉多余导入 · 5a8e02c9
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  5a8e02c9 Browse Files
- 新增麦咖啡购物车 · 6daa9fd1
  ping.wu committed Jul 30, 2020
  
  6daa9fd1 Browse Files
- assortment-shopping-sdk 升级 · 330513ce
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  330513ce Browse Files
- assortment-shopping-sdk 升级 · f0b5b013
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  f0b5b013 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · e513408e
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Jul 30, 2020
  e513408e Browse Files
- 商品加料 · 77299951
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  77299951 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b14608cc
  chongfu.liang committed Jul 30, 2020
  
  b14608cc Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · a6c584b8
  chongfu.liang committed Jul 30, 2020
  
  a6c584b8 Browse Files
- 加料商品开发 · f2c1166f
  chongfu.liang committed Jul 30, 2020
  
  f2c1166f Browse Files
29 Jul, 2020 4 commits
- Merge branch 'develop' of… · c9c054f3
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  zhiheng.zhang committed Jul 29, 2020
  c9c054f3 Browse Files
- 图片url返回处理 · fd21c7f1
  zhiheng.zhang committed Jul 29, 2020
  
  fd21c7f1 Browse Files
- Merge branch '20200729_订单完成时送集点_zhanghongtao' of… · e1044ee5
```
Merge branch '20200729_订单完成时送集点_zhanghongtao' of gitlab.freemud.com:order-group-application/order-group into develop
```
  张洪涛 committed Jul 29, 2020
  e1044ee5 Browse Files
- 支付成功时送集点（移除） · 4534328a
  张洪涛 committed Jul 29, 2020
  
  4534328a Browse Files