Commits · 3d623e5ca26ee2a94c7288aa4abf71067aafd183 · order-group-application / order-group · GitLab

28 Sep, 2020 15 commits
- 修复套餐价格不对 · 3d623e5c
  徐康 committed Sep 28, 2020
  
  3d623e5c Browse Files
- Merge branch 'bugfix/20200924_修复问题临时分支' into qa · 83171ea6
  徐康 committed Sep 28, 2020
  
  83171ea6 Browse Files
- 修复套餐价格不对 · b6bea35d
  徐康 committed Sep 28, 2020
  
  b6bea35d Browse Files
- mccafe套餐价格重新计算 · 734bec0f
  徐康 committed Sep 28, 2020
  
  734bec0f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 695de7c7
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  695de7c7 Browse Files
- 对接促销算价Alpha->fix · 62d6eaca
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  62d6eaca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 75b8c7b9
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  75b8c7b9 Browse Files
- 对接促销算价Alpha->fix · a75c6358
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  a75c6358 Browse Files
- 对接促销算价Alpha->fix · 714ed0c0
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  714ed0c0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 13fd24f5
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  13fd24f5 Browse Files
- 对接促销算价Alpha->fix · eaa5c377
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  eaa5c377 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · f7e261d8
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  f7e261d8 Browse Files
- 对接促销算价Alpha->fix · d34c33b6
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  d34c33b6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 3a50e9c6
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  3a50e9c6 Browse Files
- 对接促销算价Alpha->fix · cf2def0a
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  cf2def0a Browse Files
27 Sep, 2020 25 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