Commits · master · chongli / fun-member

23 Jul, 2019 1 commit
- 会员详情增加玩家俱乐部社员信息 · 07d671c1
```
——————————————
AnLing
```
  Iwan committed Jul 23, 2019
  07d671c1 Browse Files
17 Jul, 2019 1 commit
- 1.添加社员开始时间和到期时间 · 76819725
  zhangchen committed Jul 17, 2019
  
  76819725 Browse Files
28 Apr, 2019 1 commit
- 1.添加依赖 · d8d72671
  zhangchen committed Apr 28, 2019
  
  d8d72671 Browse Files
21 Mar, 2019 6 commits
- Bug 修复添加充值卡Tab · 8b9782dd
```
------------------ Carson
```
  CarsonChen committed Mar 21, 2019
  8b9782dd Browse Files
- 1.储值卡查询 · 8010a20a
  zhangchen committed Mar 21, 2019
  
  8010a20a Browse Files
- 提交 · 12e56013
```
——————————————
Carson
```
  Iwan committed Mar 21, 2019
  12e56013 Browse Files
- Merge branch 'master' of http://192.168.10.6:8090/chongli/fun-member · d85212ce
```
* 'master' of http://192.168.10.6:8090/chongli/fun-member:
  临时提交

# Conflicts:
#	src/main/resources/static/asset-manifest.json
#	src/main/resources/static/index.html
#	src/main/resources/static/umi.c56ce830.js
```
  Iwan committed Mar 21, 2019
  d85212ce Browse Files
- 添加储值卡 · 0f20d628
```
——————————————
Carson
```
  Iwan committed Mar 21, 2019
  0f20d628 Browse Files
- 临时提交 · f609555a
  CarsonChen committed Mar 21, 2019
  
  f609555a Browse Files
15 Mar, 2019 1 commit
- 修复高级查询分页的Bug · 0ebc9677
```
——————————————
Carson
```
  Iwan committed Mar 15, 2019
  0ebc9677 Browse Files
14 Mar, 2019 2 commits
- Merge branch 'master' of 192.168.10.6:chongli/fun-member · 60994169
  chongli committed Mar 14, 2019
  
  60994169 Browse Files
- 会员档案现金券查询增加查看已使用、未使用、已过期 · 9e733b65
  chongli committed Mar 14, 2019
  
  9e733b65 Browse Files
08 Mar, 2019 1 commit
- 对优惠券的类型进行筛选 · 680c872f
```
——————————————
Carson
```
  Iwan committed Mar 08, 2019
  680c872f Browse Files
28 Feb, 2019 1 commit
- 会员详情返回不返回到current为1页 · 643033b9
```
——————————————
Carson
```
  Iwan committed Feb 28, 2019
  643033b9 Browse Files
22 Feb, 2019 2 commits
- 会员档案添加查看优惠券功能 · c876e2fe
  chongli committed Feb 22, 2019
  
  c876e2fe Browse Files
- 前端新增优惠券查看模块 · 247710da
```
——————————————
Carson
```
  Iwan committed Feb 22, 2019
  247710da Browse Files
28 Jan, 2019 17 commits
- Merge branch 'master' of 192.168.10.6:chongli/fun-member · e255c12b
  chongli committed Jan 28, 2019
  
  e255c12b Browse Files
- 爱玩会员绑定一个销售一个会服 · a68f7e4b
  chongli committed Jan 28, 2019
  
  a68f7e4b Browse Files
- 更换API Prefix · 0e723fe5
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  0e723fe5 Browse Files
- clear · adeaf985
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  adeaf985 Browse Files
- 手机号码脱敏 · 53ee71f3
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  53ee71f3 Browse Files
- 临时处理 · 2766710d
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  2766710d Browse Files
- 临时更换原来版本 · cec7c261
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  cec7c261 Browse Files
- MobilePhone 脱敏 · 364b32d8
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  364b32d8 Browse Files
- init Project · 7ec9c0c4
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  7ec9c0c4 Browse Files
- Merge branch 'master' of http://192.168.10.6:8090/chongli/fun-member · 62d2fae9
```
* 'master' of http://192.168.10.6:8090/chongli/fun-member:
  删除 —————————————— Carson
  —————————————— Carson
  —————————————— Carson
  会员列表数据手机号脱敏 —————————————— Carson
```
  Iwan committed Jan 28, 2019
  62d2fae9 Browse Files
- 删除 · bbbc34ac
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  bbbc34ac Browse Files
- —————————————— · 9332a051
```
Carson
```
  Iwan committed Jan 28, 2019
  9332a051 Browse Files
- 会员列表数据手机号脱敏 · eb39a454
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  eb39a454 Browse Files
- 删除 · 7198b649
```
——————————————
Carson
```
  Iwan committed Jan 28, 2019
  7198b649 Browse Files
- —————————————— · 623498a2
```
Carson
```
  Iwan committed Jan 28, 2019
  623498a2 Browse Files
- Merge branch 'master' of http://192.168.10.6:8090/chongli/fun-member · 1c3d998c
```
* 'master' of http://192.168.10.6:8090/chongli/fun-member:
  会员列表数据手机号脱敏 —————————————— Carson
```
  Iwan committed Jan 28, 2019
  1c3d998c Browse Files
- —————————————— · 90ed9f7e
```
Carson
```
  Iwan committed Jan 28, 2019
  90ed9f7e Browse Files
25 Jan, 2019 1 commit
- 会员列表数据手机号脱敏 · c3b73ba1
```
——————————————
Carson
```
  Iwan committed Jan 25, 2019
  c3b73ba1 Browse Files
19 Nov, 2018 1 commit
- public · 03eb09d3
  wangzhengeric committed Nov 19, 2018
  
  03eb09d3 Browse Files
01 Nov, 2018 1 commit
- 修正刷新token报错 · 215f5646
  chongli committed Nov 01, 2018
  
  215f5646 Browse Files
31 Oct, 2018 4 commits
- public · 2d7770af
  wangzhengeric committed Oct 31, 2018
  
  2d7770af Browse Files
- Merge branch 'master' of 192.168.10.6:chongli/fun-member · 53fc14cb
  chongli committed Oct 31, 2018
  
  53fc14cb Browse Files
- public · 62ad4c40
  wangzhengeric committed Oct 31, 2018
  
  62ad4c40 Browse Files
- Merge branch 'master' of 192.168.10.6:chongli/fun-member · b85f4630
  chongli committed Oct 31, 2018
  
  b85f4630 Browse Files