Commits · 6ba4095594584134134f0bb9890e78ce7b44b4ab · order-group-application / order-group · GitLab

16 Jun, 2021 12 commits
- Merge remote-tracking branch 'origin/qa' into qa · 6ba40955
  zhangzhiheng committed Jun 16, 2021
  
  6ba40955 Browse Files
- 开放平台取消订单迁移 · b485dc0f
  zhangzhiheng committed Jun 16, 2021
  
  b485dc0f Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · fdca4726
  徐康 committed Jun 16, 2021
  
  fdca4726 Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into… · cc92303f
```
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
```
  徐康 committed Jun 16, 2021
  cc92303f Browse Files
- 合并商品 · 3751f1d2
  徐康 committed Jun 16, 2021
  
  3751f1d2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6f914aba
  zhangzhiheng committed Jun 16, 2021
  
  6f914aba Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · f2869382
  徐康 committed Jun 16, 2021
  
  f2869382 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · af2f4a0d
  徐康 committed Jun 16, 2021
  
  af2f4a0d Browse Files
- qty · 326cf769
  徐康 committed Jun 16, 2021
  
  326cf769 Browse Files
- 开放平台取消订单迁移 · 2b183316
  zhangzhiheng committed Jun 16, 2021
  
  2b183316 Browse Files
- Merge branch 'feature/20210610-开放平台取消订单接口移动-张志恒' into qa · 0ee4e5aa
  zhangzhiheng committed Jun 16, 2021
  
  0ee4e5aa Browse Files
- 开放平台取消订单迁移 · 5601ebc2
  zhangzhiheng committed Jun 16, 2021
  
  5601ebc2 Browse Files
15 Jun, 2021 28 commits
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 0fb05f45
  徐康 committed Jun 15, 2021
  
  0fb05f45 Browse Files
- 异常信息打印 · 43bf2bd1
  徐康 committed Jun 15, 2021
  
  43bf2bd1 Browse Files
- 异常信息打印 · 012d9bea
  徐康 committed Jun 15, 2021
  
  012d9bea Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 1ff37f5f
  徐康 committed Jun 15, 2021
  
  1ff37f5f Browse Files
- 优惠设置 · 97891240
  徐康 committed Jun 15, 2021
  
  97891240 Browse Files
- test · 341f6199
  徐康 committed Jun 15, 2021
  
  341f6199 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · cb2d6e1d
  徐康 committed Jun 15, 2021
  
  cb2d6e1d Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · abcd59cd
  徐康 committed Jun 15, 2021
  
  abcd59cd Browse Files
- 更新数量问题 · 0312c4c9
  徐康 committed Jun 15, 2021
  
  0312c4c9 Browse Files
- test · 2111dbc0
  徐康 committed Jun 15, 2021
  
  2111dbc0 Browse Files
- Merge branch 'hotfix/20210610_codev4_coupon_npe_miaohui' into 'qa' · 1d970695
```
platform orderCheck coupon NPE repaired

See merge request !118
```
  缪晖 committed Jun 15, 2021
  1d970695 Browse Files
- platform orderCheck coupon NPE repaired · 95b3dff8
  缪晖 committed Jun 15, 2021
  
  95b3dff8 Browse Files
- merge冲突 · 087785a4
  王世昌 committed Jun 15, 2021
  
  087785a4 Browse Files
- Merge branch 'feature/20210608-修复频次券可用门店判断' into qa · c6351650
  王世昌 committed Jun 15, 2021
  
  c6351650 Browse Files
- Merge branch 'feature/20210527-购物车重构V2-王世昌' into qa · 20fb0abd
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/list/ListCartGoodsBO.java
#	shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformAddGoodsService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java
```
  王世昌 committed Jun 15, 2021
  20fb0abd Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 8e3b6af3
  徐康 committed Jun 15, 2021
  
  8e3b6af3 Browse Files
- 买券 · 46b7cf16
  徐康 committed Jun 15, 2021
  
  46b7cf16 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · b5c54f71
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Jun 15, 2021
  b5c54f71 Browse Files
- 批量删券 · c479dfa0
  徐康 committed Jun 15, 2021
  
  c479dfa0 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · c9db8dc8
  徐康 committed Jun 15, 2021
  
  c9db8dc8 Browse Files
- 问题修复 · 24f0139e
  徐康 committed Jun 15, 2021
  
  24f0139e Browse Files
- 日志 · 460a13b2
  徐康 committed Jun 15, 2021
  
  460a13b2 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · a9c46bdc
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Jun 15, 2021
  a9c46bdc Browse Files
- 问题修复 · ac638702
  徐康 committed Jun 15, 2021
  
  ac638702 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 1de76e12
  徐康 committed Jun 15, 2021
  
  1de76e12 Browse Files
- b3s1 · 24815dfa
  徐康 committed Jun 15, 2021
  
  24815dfa Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · 03a5b063
  徐康 committed Jun 15, 2021
  
  03a5b063 Browse Files
- 保留整数 · 74ec988a
  徐康 committed Jun 15, 2021
  
  74ec988a Browse Files