Commits · b702e0e78eccfe413b8ba60e842ae88a8b4a2b7d · tencent / services · GitLab

02 Sep, 2019 7 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · b702e0e7
  王召彬 committed Sep 02, 2019
  
  b702e0e7 Browse Files
- Merge branch 'feature-v3' into test · 8ffbd8b4
  王召彬 committed Sep 02, 2019
  
  8ffbd8b4 Browse Files
- getReservListByCmanId添加参数 · 87ffed16
  王召彬 committed Sep 02, 2019
  
  87ffed16 Browse Files
- Merge branch 'frontmoney' into test · b54868ed
  王洁 committed Sep 02, 2019
  
  b54868ed Browse Files
- pool · 2f4bf048
  王洁 committed Sep 02, 2019
  
  2f4bf048 Browse Files
- Merge branch 'frontmoney' into test · 27740b14
  王洁 committed Sep 02, 2019
  
  27740b14 Browse Files
- 参数名字 · dc85161d
  王洁 committed Sep 02, 2019
  
  dc85161d Browse Files
28 Aug, 2019 3 commits
- Merge branch 'frontmoney' into test · 9b58be03
  王洁 committed Aug 28, 2019
  
  9b58be03 Browse Files
- 接口 · e2a19f1b
  王洁 committed Aug 28, 2019
  
  e2a19f1b Browse Files
- 整理 · 827df7ce
  王洁 committed Aug 28, 2019
  
  827df7ce Browse Files
27 Aug, 2019 6 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 80fb9584
  王召彬 committed Aug 27, 2019
  
  80fb9584 Browse Files
- Merge branch 'feature-v3' into test · 190eb34d
  王召彬 committed Aug 27, 2019
  
  190eb34d Browse Files
- 去除方法getGender · 6f3fd751
  王召彬 committed Aug 27, 2019
  
  6f3fd751 Browse Files
- Merge remote-tracking branch 'origin/test' into test · bece8ce3
  xmy committed Aug 27, 2019
  
  bece8ce3 Browse Files
- Merge branch 'v3' into test · 4e5cd942
  xmy committed Aug 27, 2019
  
  4e5cd942 Browse Files
- feat：GetAndUpdateOpenId · 6a76974f
  xmy committed Aug 27, 2019
  
  6a76974f Browse Files
26 Aug, 2019 2 commits
- Merge branch 'feature-v3' into test · dc7d4dc7
  王召彬 committed Aug 26, 2019
  
  dc7d4dc7 Browse Files
- 添加店员服务的枚举类 · 3e76dfe2
  王召彬 committed Aug 26, 2019
  
  3e76dfe2 Browse Files
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 6 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