Commits · b49af66ab4dbe8e69bbd7bec2f67447c4ad092b1 · member / member · GitLab

23 Jan, 2022 6 commits
- Merge branch 'bugfix/集团会员等级修改' of http://git.gicdev.com/gicmember/member into dev · b49af66a
  chenyu authored Jan 23, 2022
  
  b49af66a Browse Files
- update: update · 1485fbb6
  chenyu authored Jan 23, 2022
  
  1485fbb6 Browse Files
- update: update · 90193504
  chenyu authored Jan 23, 2022
  
  90193504 Browse Files
- update: dist · 56866749
  chenyu authored Jan 23, 2022
  
  56866749 Browse Files
- Merge branch 'bugfix/集团会员等级修改' of http://git.gicdev.com/gicmember/member into dev · 05bd03c9
  chenyu authored Jan 23, 2022
  
  05bd03c9 Browse Files
- update: update · a8db5c53
  chenyu authored Jan 23, 2022
  
  a8db5c53 Browse Files
21 Jan, 2022 3 commits
- update: build · ed5d97ed
  liuchenxi authored Jan 21, 2022
  
  ed5d97ed Browse Files
- Merge branch 'feature/1月迭代-年后' into dev · 75aa0ce2
```
# Conflicts:
#	src/components/allCustomers/customerDetail.vue
```
  liuchenxi authored Jan 21, 2022
  75aa0ce2 Browse Files
- update: 会员详情文件dev缺少内容 · b63aa3fc
  liuchenxi authored Jan 21, 2022
  
  b63aa3fc Browse Files
20 Jan, 2022 10 commits
- update: dist · dc105d8d
  chenyu authored Jan 20, 2022
  
  dc105d8d Browse Files
- Merge branch 'feature/1月迭代-年后' of http://git.gicdev.com/gicmember/member into dev · 6022366f
  chenyu authored Jan 20, 2022
  
  6022366f Browse Files
- update: style · a0c140b4
  chenyu authored Jan 20, 2022
  
  a0c140b4 Browse Files
- Merge branch 'feature/1月迭代-年后' of http://git.gicdev.com/gicmember/member into dev · c4b238c3
  chenyu authored Jan 20, 2022
  
  c4b238c3 Browse Files
- update: 客户类型初始值 · 4943e37c
  chenyu authored Jan 20, 2022
  
  4943e37c Browse Files
- update: build · e11f8657
  liuchenxi authored Jan 20, 2022
  
  e11f8657 Browse Files
- Merge branch 'feature/1月迭代-年后' into dev · e4c81f98
  liuchenxi authored Jan 20, 2022
  
  e4c81f98 Browse Files
- update: ui · ca4263df
  liuchenxi authored Jan 20, 2022
  
  ca4263df Browse Files
- Merge branch 'feature/1月迭代-年后' into dev · e57539a8
```
# Conflicts:
#	dist/index.html
#	dist/js/1.41e075e60398f4e8a677.js
#	dist/js/manifest.e4a1a9e595fe369ad8c1.js
```
  liuchenxi authored Jan 20, 2022
  e57539a8 Browse Files
- update: 客户列表，详情优化 · 59398488
  liuchenxi authored Jan 20, 2022
  
  59398488 Browse Files
11 Jan, 2022 5 commits
- update: dist · fdaa2707
  caoyanzhi authored Jan 11, 2022
  
  fdaa2707 Browse Files
- update: dist · a2b64410
  caoyanzhi authored Jan 11, 2022
  
  a2b64410 Browse Files
- Merge branch 'bugfix/修复会员积分展示bug' into dev · f1910406
```
# Conflicts:
#	dist/index.html
#	dist/js/2.4ab66ee64d370cead7e5.js
#	dist/js/2.734efe8b6edb198cb81b.js
#	dist/js/2.c7b84ca830442327e6a9.js
#	dist/js/app.689778eb1bb66640b44f.js
#	dist/js/app.c0d109c2ec08406cfdf4.js
#	dist/js/app.db632a07545e15006461.js
#	dist/js/manifest.c424331b4bd11238ef32.js
```
  caoyanzhi authored Jan 11, 2022
  f1910406 Browse Files
- update: 修复会员积分展示bug · 20a28afc
  caoyanzhi authored Jan 11, 2022
  
  20a28afc Browse Files
- update: dist · 46d04607
  chenyu authored Jan 11, 2022
  
  46d04607 Browse Files
07 Jan, 2022 3 commits
- update: dist · 3b0f95b2
  chenyu authored Jan 07, 2022
  
  3b0f95b2 Browse Files
- Merge branch 'bugfix/COZY-STEPS-会员标签无法全部取消' of http://git.gicdev.com/gicmember/member into dev · b96f354f
  chenyu authored Jan 07, 2022
  
  b96f354f Browse Files
- update: cancel label's validator · 24fe57e3
  chenyu authored Jan 07, 2022
  
  24fe57e3 Browse Files
06 Jan, 2022 11 commits
- update: update · 3f26c5b9
  chenyu authored Jan 06, 2022
  
  3f26c5b9 Browse Files
- update: update · 18b62008
  chenyu authored Jan 06, 2022
  
  18b62008 Browse Files
- Merge branch 'bugfix/1月6优化' of http://git.gicdev.com/gicmember/member into dev · 61ee93fd
  chenyu authored Jan 06, 2022
  
  61ee93fd Browse Files
- Merge branch 'master' of http://git.gicdev.com/gicmember/member into bugfix/1月6优化 · 2a0ae7ac
  chenyu authored Jan 06, 2022
  
  2a0ae7ac Browse Files
- Merge branch 'feature/12月迭代' · df11eb79
```
# Conflicts:
#	src/components/allCustomers/customerDetail.vue
```
  chenyu authored Jan 06, 2022
  df11eb79 Browse Files
- Merge branch 'bugfix/会员手机号国内号段增加位数限制' into feature/12月迭代 · 1f999a37
```
# Conflicts:
#	src/components/allCustomers/customerDetail.vue
```
  chenyu authored Jan 06, 2022
  1f999a37 Browse Files
- update: 身形 · b3df8204
  chenyu authored Jan 06, 2022
  
  b3df8204 Browse Files
- upate: dist · 18295259
  chenyu authored Jan 06, 2022
  
  18295259 Browse Files
- update: dist · de4b94e1
  chenyu authored Jan 06, 2022
  
  de4b94e1 Browse Files
- Merge branch 'bugfix/1月6优化' of http://git.gicdev.com/gicmember/member into dev · 1ff1e953
  chenyu authored Jan 06, 2022
  
  1ff1e953 Browse Files
- update: update · 43b557cf
  chenyu authored Jan 06, 2022
  
  43b557cf Browse Files
05 Jan, 2022 2 commits
- update: dist · 012eb7f2
  chenyu authored Jan 05, 2022
  
  012eb7f2 Browse Files
- update: dist · 191db880
  chenyu authored Jan 05, 2022
  
  191db880 Browse Files