Commits · 75c7f1fb1b171cb98462d64f156a6dcad82f0896 · alpha / sun

22 Feb, 2019 2 commits
- Merge branch 'haow/dev' into 'dev' · 75c7f1fb
  王浩 authored Feb 22, 2019
```
fix tag info api if id is str

See merge request !68
```
  75c7f1fb
- fix tag info api if id is str · 5546b257
  王浩 authored Feb 22, 2019
  
  5546b257
21 Feb, 2019 8 commits
- Merge branch 'haow/dev' into 'dev' · 077988b8
  王浩 authored Feb 21, 2019
```
tag add collection alias

See merge request !67
```
  077988b8
- add collection tag in tag and topic · b71ab3a3
  王浩 authored Feb 21, 2019
  
  b71ab3a3
- Merge branch 'master' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev · 21ddba98
  王浩 authored Feb 21, 2019
  
  21ddba98
- Merge branch 'chenwei/feature/suggestion' into 'dev' · 48d41d3b
  陈伟 authored Feb 21, 2019
```
增加意见和建议

See merge request !66
```
  48d41d3b
- 增加导入 · f8ebbea5
  Davve authored Feb 21, 2019
  
  f8ebbea5
- 解决冲突 · df19dbdc
  Davve authored Feb 21, 2019
  
  df19dbdc
- 解决冲突 · 96b89357
  Davve authored Feb 21, 2019
  
  96b89357
- Merge branch 'master' into dev · 5bc51f02
  Davve authored Feb 21, 2019
  
  5bc51f02
18 Feb, 2019 1 commit
- Merge branch 'test' into 'master' · 3cf4253e
  王浩 authored Feb 18, 2019
```
Alpha 1.3 上线

See merge request !65
```
  3cf4253e
15 Feb, 2019 5 commits
- Merge branch 'feature/create_image_zy' into 'master' · e2dc1971
  zhanglu authored Feb 15, 2019
```
人脸图片保存

See merge request !64
```
  e2dc1971
- Merge branch 'feature/create_image_zy' into 'test' · 57ccac06
  zhanglu authored Feb 15, 2019
```
注释扫脸逻辑

See merge request !63
```
  57ccac06
- 增加意见和建议 · d77202ba
  Davve authored Feb 15, 2019
  
  d77202ba
- Merge branch 'feature/suggestion' into dev · fcc751c1
  Davve authored Feb 15, 2019
  
  fcc751c1
- 清除代码 · 50a10ef2
  Davve authored Feb 15, 2019
  
  50a10ef2
14 Feb, 2019 5 commits
- Merge branch 'feature/create_image_zy' into 'dev' · a428a228
  zhanglu authored Feb 14, 2019
```
注释扫脸逻辑

See merge request !62
```
  a428a228
- 注释扫脸逻辑 · b939fca8
  张永 authored Feb 14, 2019
  
  b939fca8
- Merge branch 'feature/suggestion' into 'dev' · 49bcea70
  陈伟 authored Feb 14, 2019
```
增加意见接口

See merge request !61
```
  49bcea70
- Merge branch 'feature/suggestion' into 'test' · c84fc087
  陈伟 authored Feb 14, 2019
```
增加意见接口

See merge request !60
```
  c84fc087
- 增加意见接口 · 3c2ea6dc
  Davve authored Feb 14, 2019
  
  3c2ea6dc
13 Feb, 2019 3 commits
- Merge branch 'feature/create_image_zy' into 'test' · b073175f
  张永 authored Feb 13, 2019
```
fix

See merge request !59
```
  b073175f
- fix · b329f630
  张永 authored Feb 13, 2019
  
  b329f630
- Merge branch 'feature/create_image_zy' into 'test' · 78fbdc84
  张永 authored Feb 13, 2019
```
fix

See merge request !58
```
  78fbdc84
02 Feb, 2019 1 commit
- fix · dab15d0c
  张永 authored Feb 02, 2019
  
  dab15d0c
01 Feb, 2019 6 commits
- Merge branch 'dev' into test · ca3ec3cb
  zhanglu authored Feb 01, 2019
  
  ca3ec3cb
- 模型类型 · 06e7e5aa
  zhanglu authored Feb 01, 2019
  
  06e7e5aa
- Merge branch 'dev' into 'test' · 2a361917
  zhanglu authored Feb 01, 2019
```
Dev

See merge request !57
```
  2a361917
- Merge branch 'feature/create_image_zy' into 'dev' · a18cb3b7
  zhanglu authored Feb 01, 2019
```
Feature/create image zy

See merge request !56
```
  a18cb3b7
- 用户头像 · 075bdd53
  张永 authored Feb 01, 2019
  
  075bdd53
- Merge branch 'dev' into 'test' · 87c0e7c0
  zhanglu authored Feb 01, 2019
```
Dev

See merge request !55
```
  87c0e7c0
28 Jan, 2019 3 commits
- fix urls · e599d221
  王浩 authored Jan 28, 2019
  
  e599d221
- Merge branch 'haow/dev' into 'dev' · dbe08dcb
  王浩 authored Jan 28, 2019
```
add face part api

See merge request !54
```
  dbe08dcb
- add face part api · a8f57eee
  王浩 authored Jan 28, 2019
  
  a8f57eee
22 Jan, 2019 4 commits
- Merge branch 'xujunpeng/hotfix/fix_1' into 'master' · 17f9d47a
  zhanglu authored Jan 22, 2019
```
恢复误删代码

See merge request !53
```
  17f9d47a
- Merge branch 'xujunpeng/hotfix/fix_1' into 'dev' · 235b9cca
  许俊鹏 authored Jan 22, 2019
```
恢复误删代码

See merge request !52
```
  235b9cca
- 恢复误删代码 · cd44c708
  许俊鹏 authored Jan 22, 2019
  
  cd44c708
- Merge branch 'dev' into 'master' · 3ef3f19f
  王浩 authored Jan 22, 2019
```
alpha 1.2

See merge request !51
```
  3ef3f19f
19 Jan, 2019 2 commits
- Merge branch 'haow/dev' into 'dev' · 167077c8
  王浩 authored Jan 19, 2019
```
tag search add page count

See merge request !50
```
  167077c8
- tag search add page count · 5085d20d
  王浩 authored Jan 19, 2019
  
  5085d20d