Commits · 975cb72b70e67ffe65052cea040c67019999d8e7 · order-group-application / order-group

29 Sep, 2020 2 commits

Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into qa · 975cb72b

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Sep 29, 2020

975cb72b Browse Files

payChannelType获取路径修改 · 30f80495
zhiheng.zhang committed Sep 29, 2020

30f80495 Browse Files

27 Sep, 2020 34 commits
- Merge remote-tracking branch 'origin/qa' into qa · c17b6646
  zhiheng.zhang committed Sep 27, 2020
  
  c17b6646 Browse Files
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' into qa · 9f4801dd
  zhiheng.zhang committed Sep 27, 2020
  
  9f4801dd Browse Files
- sqa测试查询两个月的数据，生产不做修改 · 7e03122e
  zhiheng.zhang committed Sep 27, 2020
  
  7e03122e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 6688356f
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  6688356f Browse Files
- 对接促销算价Alpha->fix · 51e3855c
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  51e3855c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 22bab378
  zhiheng.zhang committed Sep 27, 2020
  
  22bab378 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020/09/07-1.9.38-优惠信息入库-张志恒' into qa · 50c97d5e
  zhiheng.zhang committed Sep 27, 2020
  
  50c97d5e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 070bb6c2
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  070bb6c2 Browse Files
- 对接促销算价Alpha->fix · 2d01bd54
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  2d01bd54 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c181274e
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  c181274e Browse Files
- 对接促销算价Alpha->fix · 128c0cd3
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  128c0cd3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 4a4298ef
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  4a4298ef Browse Files
- 对接促销算价Alpha->fix · 22f96c3d
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  22f96c3d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 501dd3d4
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  501dd3d4 Browse Files
- 对接促销算价Alpha->fix · e33a1dde
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  e33a1dde Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · e2909b04
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  e2909b04 Browse Files
- 对接促销算价Alpha->fix · 7356cafb
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  7356cafb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 630cd1b4
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  630cd1b4 Browse Files
- 对接促销算价Alpha->fix · 25d58def
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  25d58def Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 0d04bddf
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  0d04bddf Browse Files
- 对接促销算价Alpha->fix · 74bc1e70
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  74bc1e70 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · dc9f0d69
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  dc9f0d69 Browse Files
- 对接促销算价Alpha->fix · cc028566
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  cc028566 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 372045a6
  孙昱 committed Sep 27, 2020
  
  372045a6 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 79150162
  孙昱 committed Sep 27, 2020
  
  79150162 Browse Files
- sunyu::update::fix bug about change store check cart Info · 55cb81e6
  孙昱 committed Sep 27, 2020
  
  55cb81e6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · f2e2fc71
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  f2e2fc71 Browse Files
- 对接促销算价Alpha->fix · 0baa81f1
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  0baa81f1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 5a198cb4
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  5a198cb4 Browse Files
- 对接促销算价Alpha->fix · ff17b50f
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  ff17b50f Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of… · d306ead7
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Sep 27, 2020
  d306ead7 Browse Files
- appValue 为空字符串判断 · dde7085d
  ping.wu committed Sep 27, 2020
  
  dde7085d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 63143920
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  63143920 Browse Files
- 对接促销算价Alpha->fix · 352f7b26
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  352f7b26 Browse Files
26 Sep, 2020 4 commits
- Merge branch 'feature-yu.sun-20200915-new' into qa · 55562237
  孙昱 committed Sep 26, 2020
  
  55562237 Browse Files
- sunyu::update::fix bug about check store · 16f3764f
  孙昱 committed Sep 26, 2020
  
  16f3764f Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 48daf2e7
  孙昱 committed Sep 26, 2020
  
  48daf2e7 Browse Files
- sunyu::fix bug about switch store · c9b1a844
  孙昱 committed Sep 26, 2020
  
  c9b1a844 Browse Files