Commits · test-bak · tencent / services · GitLab

26 Nov, 2019 11 commits
- Merge branch 'coupon-membercard' into test · 144d340e
  王洁 committed Nov 26, 2019
  
  144d340e Browse Files
- coupon-Enum · 1beee62e
  王洁 committed Nov 26, 2019
  
  1beee62e Browse Files
- Merge branch 'coupon-membercard' into test · 8f356ee1
  王洁 committed Nov 26, 2019
  
  8f356ee1 Browse Files
- 接口改名字-coupon · cb633526
  王洁 committed Nov 26, 2019
  
  cb633526 Browse Files
- coupon 接口改名字 · 42f4e633
  王洁 committed Nov 26, 2019
  
  42f4e633 Browse Files
- Merge branch 'coupon-membercard' into test · 45524a15
  王洁 committed Nov 26, 2019
  
  45524a15 Browse Files
- deferIfUserGetCard(int $storeId,int $userId,int $escrow) · 3b497d40
  王洁 committed Nov 26, 2019
  
  3b497d40 Browse Files
- Merge branch 'coupon-membercard' into test · 2f9cae25
  王洁 committed Nov 26, 2019
  
  2f9cae25 Browse Files
- ifUserGetCard + 参数 escrow · cdaaf5b0
  王洁 committed Nov 26, 2019
  
  cdaaf5b0 Browse Files
- Merge branch 'coupon-membercard' into test · e29ff5a1
  王洁 committed Nov 26, 2019
  
  e29ff5a1 Browse Files
- 优惠券相关Rpc · f62e21f3
  王洁 committed Nov 26, 2019
  
  f62e21f3 Browse Files
25 Nov, 2019 1 commit
- Merge branch 'ft-coupon' into test · 5f68bea2
```
# Conflicts:
#	src/Goods/Lib/GoodsInterface.php
```
  xmy committed Nov 25, 2019
  5f68bea2 Browse Files
22 Nov, 2019 26 commits
- Merge branch 'ft-buyer-agent' into test · a0d43176
```
# Conflicts:
#	src/Buyer/Lib/BillInterface.php
#	src/Logistics/Lib/LogisticsInterface.php
```
  xmy committed Nov 22, 2019
  a0d43176 Browse Files
- feat:代理 · 9bdc1e69
  xmy committed Nov 22, 2019
  
  9bdc1e69 Browse Files
- feat:优惠卷 · 2c4aa7d2
  xmy committed Nov 22, 2019
  
  2c4aa7d2 Browse Files
- Merge remote-tracking branch 'origin/test' into test · e957f270
  xmy committed Nov 22, 2019
  
  e957f270 Browse Files
- Merge branch 'ft-buyer-agent' into test · d3ce6853
```
# Conflicts:
#	src/Buyer/Lib/BillInterface.php
#	src/Comments/Enum/StarEnum.php
#	src/Comments/Lib/CommentsInterface.php
#	src/Logistics/Lib/LogisticsInterface.php
```
  xmy committed Nov 22, 2019
  d3ce6853 Browse Files
- feat：评论枚举 · 0ecd492a
  xmy committed Nov 22, 2019
  
  0ecd492a Browse Files
- feat：虚拟人 · 043465b3
  xmy committed Nov 22, 2019
  
  043465b3 Browse Files
- feat：物流 · 3504c285
  xmy committed Nov 22, 2019
  
  3504c285 Browse Files
- feat：运费计算 · 35a08f74
  xmy committed Nov 22, 2019
  
  35a08f74 Browse Files
- feat：运费计算 · 4ee5c038
  xmy committed Nov 22, 2019
  
  4ee5c038 Browse Files
- feat：获取用户by openid · eb6cded5
  xmy committed Nov 22, 2019
  
  eb6cded5 Browse Files
- feat：获取用户by openid · d9c3dbbd
  xmy committed Nov 22, 2019
  
  d9c3dbbd Browse Files
- feat：物流接受通知rpc · e02a30d8
  xmy committed Nov 22, 2019
  
  e02a30d8 Browse Files
- feat：创建分销商 · f27a27c6
  xmy committed Nov 22, 2019
  
  f27a27c6 Browse Files
- feat：创建分销商 · cd093b4b
  xmy committed Nov 22, 2019
  
  cd093b4b Browse Files
- feat：获取用户by openid · 1e856873
  xmy committed Nov 22, 2019
  
  1e856873 Browse Files
- feat：获取用户by openid · c6db5ccb
  xmy committed Nov 22, 2019
  
  c6db5ccb Browse Files
- feat：获取代理by unionid · 7d17c5ef
  xmy committed Nov 22, 2019
  
  7d17c5ef Browse Files
- feat：获取代理是否可用 · 73988a95
  xmy committed Nov 22, 2019
  
  73988a95 Browse Files
- feat：获取代理是否可用 · 7a3b1278
  xmy committed Nov 22, 2019
  
  7a3b1278 Browse Files
- feat：获取代理是否可用 · 36594ce0
  xmy committed Nov 22, 2019
  
  36594ce0 Browse Files
- feat：获取代理by unionid · 99c4e8d7
  xmy committed Nov 22, 2019
  
  99c4e8d7 Browse Files
- feat：邮费类型 · acf1a6bc
  xmy committed Nov 22, 2019
  
  acf1a6bc Browse Files
- feat：商品类型 · df0f4159
  xmy committed Nov 22, 2019
  
  df0f4159 Browse Files
- feat：代理商id · d9c8b22e
  xmy committed Nov 22, 2019
  
  d9c8b22e Browse Files
- Merge branch 'comments' · ae149c03
  xmy committed Nov 22, 2019
  
  ae149c03 Browse Files
21 Nov, 2019 2 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · ebedb025
  dzhang committed Nov 21, 2019
  
  ebedb025 Browse Files
- Merge branch 'agent' into test · 2a0e4e05
  dzhang committed Nov 21, 2019
  
  2a0e4e05 Browse Files