Commits · 8be9cd5877237afd3f2cb65160e2397b29448a3a · tencent / services · GitLab

24 Aug, 2019 8 commits
- Merge branch 'feature-v3' into test · 8be9cd58
  王召彬 committed Aug 24, 2019
  
  8be9cd58 Browse Files
- user实体类添加方法getGender · f7587e2b
  王召彬 committed Aug 24, 2019
  
  f7587e2b Browse Files
- Merge branch 'feature-v3' into test · 913d2b7a
  王召彬 committed Aug 24, 2019
  
  913d2b7a Browse Files
- 修改方法名 · a910d8f6
  王召彬 committed Aug 24, 2019
  
  a910d8f6 Browse Files
- 解决冲突 · 1e94f029
  王召彬 committed Aug 24, 2019
  
  1e94f029 Browse Files
- Merge branch 'feature-v3' into test · 72c8ab81
  王召彬 committed Aug 24, 2019
  
  72c8ab81 Browse Files
- 添加创建店员的接口 · e7dc5a24
  王召彬 committed Aug 24, 2019
  
  e7dc5a24 Browse Files
- Merge branch 'master' into feature-v3 · 2c65a4fc
  王召彬 committed Aug 24, 2019
  
  2c65a4fc Browse Files
23 Aug, 2019 3 commits
- 配合前端v2版本上线 · a5764465
  王召彬 committed Aug 23, 2019
  
  a5764465 Browse Files
- Merge remote-tracking branch 'origin/master' · 05007744
  xmy committed Aug 23, 2019
  
  05007744 Browse Files
- Merge branch 'v2' · 4b31a5c7
  xmy committed Aug 23, 2019
  
  4b31a5c7 Browse Files
20 Aug, 2019 5 commits
- 修复bug · 348df918
  王召彬 committed Aug 20, 2019
  
  348df918 Browse Files
- Merge branch 'frontmoney' into test · 597b1c0f
  王洁 committed Aug 20, 2019
  
  597b1c0f Browse Files
- 修改 · 6f878089
  王洁 committed Aug 20, 2019
  
  6f878089 Browse Files
- Merge remote-tracking branch 'origin/master' · e43e836a
```
# Conflicts:
#	UPGRADE_2.x.md
```
  xmy committed Aug 20, 2019
  e43e836a Browse Files
- feat：vip分成比例 · 6f8ee410
  xmy committed Aug 20, 2019
  
  6f8ee410 Browse Files
19 Aug, 2019 7 commits
- 解决冲突 · 87e4ffdd
  王洁 committed Aug 19, 2019
  
  87e4ffdd Browse Files
- frontmoney · ddc8edb3
  王洁 committed Aug 19, 2019
  
  ddc8edb3 Browse Files
- frontMoney · ee5bac3c
  王洁 committed Aug 19, 2019
  
  ee5bac3c Browse Files
- Merge branch 'vip_rate' into test · 6279bcb8
  xmy committed Aug 19, 2019
  
  6279bcb8 Browse Files
- feat：vip分成比例 · a03de43b
  xmy committed Aug 19, 2019
  
  a03de43b Browse Files
- Merge branch 'v4' into test · 1f857cab
  dzhang committed Aug 19, 2019
  
  1f857cab Browse Files
- 添加orderType:TYPE_DEPOSIT · fab2ebab
  dzhang committed Aug 19, 2019
  
  fab2ebab Browse Files
16 Aug, 2019 9 commits
- Merge branch 'v3' into test · b245d263
  dzhang committed Aug 16, 2019
  
  b245d263 Browse Files
- 相册服务添加RPC接口 · 1de98dac
  dzhang committed Aug 16, 2019
  
  1de98dac Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · c4754e4c
  dzhang committed Aug 16, 2019
  
  c4754e4c Browse Files
- Merge branch 'v3' into test · 9bf7fdd8
  dzhang committed Aug 16, 2019
  
  9bf7fdd8 Browse Files
- 相册服务添加RPC接口 · 91314563
  dzhang committed Aug 16, 2019
  
  91314563 Browse Files
- 相册服务添加RPC接口 · 466b5001
  dzhang committed Aug 16, 2019
  
  466b5001 Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 479d1978
  王召彬 committed Aug 16, 2019
  
  479d1978 Browse Files
- Merge branch 'feature-v3' into test · 358fc580
  王召彬 committed Aug 16, 2019
  
  358fc580 Browse Files
- 根据店员id，获取对应的预约列表 · 14935865
  王召彬 committed Aug 16, 2019
  
  14935865 Browse Files
13 Aug, 2019 2 commits
- Merge branch 'v2' into test · 00c25404
  xmy committed Aug 13, 2019
  
  00c25404 Browse Files
- feat：获取商品（包括已删除） · 6279371e
  xmy committed Aug 13, 2019
  
  6279371e Browse Files
08 Aug, 2019 2 commits
- Merge branch 'v4' into test · e24845a8
  dzhang committed Aug 08, 2019
  
  e24845a8 Browse Files
- add rpc buyerSpendAmount pointer · 99091995
  dzhang committed Aug 08, 2019
  
  99091995 Browse Files
05 Aug, 2019 4 commits
- Cls记日志忽略‘验证器不存在’的日志 · baedffcb
  王召彬 committed Aug 05, 2019
  
  baedffcb Browse Files
- Merge branch 'fixbug-clslog' · 0680706c
  王召彬 committed Aug 05, 2019
  
  0680706c Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · a0f44967
  王召彬 committed Aug 05, 2019
  
  a0f44967 Browse Files
- Merge branch 'fixbug-clslog' into test · 3a18b15f
  王召彬 committed Aug 05, 2019
  
  3a18b15f Browse Files