Commits · 1e65e24db2bb03fc99b92ca2f2a6515b45d9c26b · tencent / services · GitLab

16 Dec, 2019 6 commits
- Merge branch 'ft-insurance' into test · 1e65e24d
  王召彬 committed Dec 16, 2019
  
  1e65e24d Browse Files
- vip保赚服务 · 92f55241
  王召彬 committed Dec 16, 2019
  
  92f55241 Browse Files
- Merge branch 'ft-insurance' into test · 8c059b2b
  王召彬 committed Dec 16, 2019
  
  8c059b2b Browse Files
- VIP保赚服务 · 5a92ddc5
  王召彬 committed Dec 16, 2019
  
  5a92ddc5 Browse Files
- Merge branch 'ft-insurance' into test · 7b90f75c
  王召彬 committed Dec 16, 2019
  
  7b90f75c Browse Files
- 添加VIP保赚服务 · 0cab6259
  王召彬 committed Dec 16, 2019
  
  0cab6259 Browse Files
14 Dec, 2019 2 commits
- Merge branch 'coupon-membercard' into test · 2983e148
  王洁 committed Dec 14, 2019
  
  2983e148 Browse Files
- IfCouponSuitOrder · 3ce9a2e6
  王洁 committed Dec 14, 2019
  
  3ce9a2e6 Browse Files
13 Dec, 2019 4 commits
- Merge branch 'ft-insurance' into test · 8d606614
  xmy committed Dec 13, 2019
  
  8d606614 Browse Files
- feat:getByUnionIds · 5edab7c8
  xmy committed Dec 13, 2019
  
  5edab7c8 Browse Files
- Merge branch 'ft-store' into test · 13e5378d
  zhangsong committed Dec 13, 2019
  
  13e5378d Browse Files
- 修改统计访客数接口 · c0339fbe
  zhangsong committed Dec 13, 2019
  
  c0339fbe Browse Files
12 Dec, 2019 17 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 0661ddd1
  zhangsong committed Dec 12, 2019
  
  0661ddd1 Browse Files
- Merge branch 'feature-notEndedActs' into test · c63d8ad7
  王洁 committed Dec 12, 2019
  
  c63d8ad7 Browse Files
- 文字 · 156fab1a
  王洁 committed Dec 12, 2019
  
  156fab1a Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · df48135f
  zhangsong committed Dec 12, 2019
  
  df48135f Browse Files
- Merge branch 'ft-store' into test · 16881c18
  zhangsong committed Dec 12, 2019
  
  16881c18 Browse Files
- Merge branch 'feature-notEndedActs' into test · 57a24984
  王洁 committed Dec 12, 2019
  
  57a24984 Browse Files
- 砍价 getNotEndedActivityList · 237d0821
  王洁 committed Dec 12, 2019
  
  237d0821 Browse Files
- 根据日期统计访客数 · 208e9d3a
  zhangsong committed Dec 12, 2019
  
  208e9d3a Browse Files
- Merge branch 'feature-notEndedActs' into test · de1b1edb
  王洁 committed Dec 12, 2019
  
  de1b1edb Browse Files
- 定金getNotEndedActivityList · f522aa04
  王洁 committed Dec 12, 2019
  
  f522aa04 Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 5f9a99ec
  dzhang committed Dec 12, 2019
  
  5f9a99ec Browse Files
- Merge branch 'ft-insurance' into test · 512791e3
  dzhang committed Dec 12, 2019
  
  512791e3 Browse Files
- 批量查询指定日期及店铺的交易统计数据 · 677ea756
  dzhang committed Dec 12, 2019
  
  677ea756 Browse Files
- Merge branch 'feature-notEndedActs' into test · 05e953d4
  王洁 committed Dec 12, 2019
  
  05e953d4 Browse Files
- 秒杀NotEndedActivityList · 0a3c1e93
  王洁 committed Dec 12, 2019
  
  0a3c1e93 Browse Files
- Merge branch 'ft-act-ongoing' into test · b01ea6ad
  xmy committed Dec 12, 2019
  
  b01ea6ad Browse Files
- feat:获取正在进行的活动 · bd516b47
  xmy committed Dec 12, 2019
  
  bd516b47 Browse Files
11 Dec, 2019 5 commits
- 解决冲突 · 5aba2efd
  dzhang committed Dec 11, 2019
  
  5aba2efd Browse Files
- 解决冲突 · 8a090f04
  dzhang committed Dec 11, 2019
  
  8a090f04 Browse Files
- 优惠券&积分 · 2787c89e
  dzhang committed Dec 11, 2019
  
  2787c89e Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 717feef7
  dzhang committed Dec 11, 2019
  
  717feef7 Browse Files
- 优惠券&积分 · ec068fb1
  dzhang committed Dec 11, 2019
  
  ec068fb1 Browse Files
06 Dec, 2019 2 commits
- Merge branch 'coupon-membercard' into test · 1c927940
  王洁 committed Dec 06, 2019
  
  1c927940 Browse Files
- getUserValidCouponNum · d977dd19
  王洁 committed Dec 06, 2019
  
  d977dd19 Browse Files
05 Dec, 2019 4 commits
- Merge branch 'ft-coupon' into test · 6c6d0c55
```
# Conflicts:
#	src/Goods/Lib/GoodsInterface.php
```
  xmy committed Dec 05, 2019
  6c6d0c55 Browse Files
- 更新UPGRADE_2.x.md · 92eea1a3
  王召彬 committed Dec 05, 2019
  
  92eea1a3 Browse Files
- Merge branch 'physical' · d0b2e80d
  dzhang committed Dec 05, 2019
  
  d0b2e80d Browse Files
- Merge remote-tracking branch 'origin/master' · 9a303064
```
# Conflicts:
#	src/Common/Pool/Config/CommentsPoolConfig.php
```
  xmy committed Dec 05, 2019
  9a303064 Browse Files