Commits · a8eb08b7ddf4c5d17b251d7af8209159ec69ab1d · alpha / sun

30 Aug, 2019 6 commits
- Merge branch 'shangwu/hotfix-tag-set' into 'test' · a8eb08b7
  钟尚武 authored Aug 30, 2019
```
词集接口增加错误处理

See merge request !337
```
  a8eb08b7
- 词集接口增加错误处理 · 11671c3b
  zhongshangwu authored Aug 30, 2019
  
  11671c3b
- Merge branch 'shangwu/hotfix-tag-set' into 'test' · c5f471ff
  钟尚武 authored Aug 30, 2019
```
新增标签词集功能

See merge request !336
```
  c5f471ff
- 新增标签词集功能 · 0ab00fc8
  zhongshangwu authored Aug 30, 2019
  
  0ab00fc8
- Merge branch 'ycl/fix' into 'test' · 26b13f65
  杨成林 authored Aug 30, 2019
```
fix

See merge request !335
```
  26b13f65
- fix · 320ad937
  yangchenglin authored Aug 30, 2019
  
  320ad937
29 Aug, 2019 2 commits
- Merge branch 'shangwu/feature-tag' into 'test' · f0df3672
  钟尚武 authored Aug 29, 2019
```
标签编辑增加参数

See merge request !334
```
  f0df3672
- 标签编辑增加参数 · cb6a9a6f
  zhongshangwu authored Aug 29, 2019
  
  cb6a9a6f
26 Aug, 2019 4 commits
- Merge branch 'ycl/fix' into 'test' · 8737f61d
  杨成林 authored Aug 26, 2019
```
add vote

See merge request !332
```
  8737f61d
- add vote · 43ab1d73
  yangchenglin authored Aug 26, 2019
  
  43ab1d73
- Merge branch 'feature_wp_pictorial' into 'test' · 1af8141e
  王鹏 authored Aug 26, 2019
```
Feature wp pictorial

See merge request !331
```
  1af8141e
- 代码完成测试环境 · 2e8ce480
  wangpeng authored Aug 26, 2019
  
  2e8ce480
23 Aug, 2019 5 commits
- Merge branch 'xujunpeng/feature/add_product' into 'master' · 4e374248
  钟尚武 authored Aug 23, 2019
```
Xujunpeng/feature/add product

See merge request !330
```
  4e374248
- 处理冲突 · 42438bb4
  许俊鹏 authored Aug 23, 2019
  
  42438bb4
- Merge branch 'ycl/topic_finish' into 'master' · e0438c35
  杨成林 authored Aug 23, 2019
```
Ycl/topic finish

See merge request !329
```
  e0438c35
- Merge branch 'ycl/fix' into 'test' · 57d886d7
  杨成林 authored Aug 23, 2019
```
fix

See merge request !328
```
  57d886d7
- fix · c3a7a1ab
  yangchenglin authored Aug 23, 2019
  
  c3a7a1ab
22 Aug, 2019 4 commits
- Merge branch 'ycl/reply_vote' into 'master' · 481e2786
  杨成林 authored Aug 22, 2019
```
reply_vote

See merge request !327
```
  481e2786
- Merge branch 'xujunpeng/feature/add_product' into 'test' · d53cb06f
  许俊鹏 authored Aug 22, 2019
```
字符串转为int

See merge request !326
```
  d53cb06f
- 字符串转为int · b0381018
  许俊鹏 authored Aug 22, 2019
  
  b0381018
- Merge branch 'xujunpeng/feature/add_product' into 'test' · 0a56dbb6
  许俊鹏 authored Aug 22, 2019
```
后台帖子表增加人脸字段

See merge request !325
```
  0a56dbb6
21 Aug, 2019 3 commits
- 后台帖子表增加人脸字段 · 106f2ef0
  许俊鹏 authored Aug 21, 2019
  
  106f2ef0
- Merge branch 'ycl/reply_vote' into 'test' · b44f8e33
  杨成林 authored Aug 21, 2019
```
reply_vote

See merge request !324
```
  b44f8e33
- reply_vote · c71af679
  yangchenglin authored Aug 21, 2019
  
  c71af679
20 Aug, 2019 6 commits
- 代码完成测试环境 · a1ef3af1
  wangpeng authored Aug 20, 2019
  
  a1ef3af1
- fix · 794c2c0b
  yangchenglin authored Aug 20, 2019
  
  794c2c0b
- Merge branch 'ycl/topic_finish' into 'test' · 391cab48
  杨成林 authored Aug 20, 2019
```
fix

See merge request !323
```
  391cab48
- fix · c58e5558
  yangchenglin authored Aug 20, 2019
  
  c58e5558
- Merge branch 'ycl/topic_finish' into 'test' · 7f88fd9f
  杨成林 authored Aug 20, 2019
```
add is_finished

See merge request !322
```
  7f88fd9f
- add is_finished · 0f4918b4
  yangchenglin authored Aug 20, 2019
  
  0f4918b4
19 Aug, 2019 1 commit
- Merge branch 'master' into 'test' · b4f8a198
  杨成林 authored Aug 19, 2019
```
Master

See merge request !320
```
  b4f8a198
18 Aug, 2019 2 commits
- Merge branch 'ycl/test_to_master' into 'master' · 137fa863
  杨成林 authored Aug 18, 2019
```
fix

See merge request !319
```
  137fa863
- fix · 70a8f596
  yangchenglin authored Aug 18, 2019
  
  70a8f596
17 Aug, 2019 4 commits
- Merge branch 'ycl/test_to_master' into 'master' · a950f348
  杨成林 authored Aug 17, 2019
```
fix

See merge request !318
```
  a950f348
- fix · c479e602
  yangchenglin authored Aug 17, 2019
  
  c479e602
- Merge branch 'ycl/test_to_master' into 'master' · 32a19c88
  杨成林 authored Aug 17, 2019
```
Ycl/test to master

See merge request !317
```
  32a19c88
- merge master · 5985e2cc
  yangchenglin authored Aug 17, 2019
  
  5985e2cc
16 Aug, 2019 3 commits
- Merge branch 'feature_docker' into 'master' · 0d69bf8f
  杨成林 authored Aug 16, 2019
```
Feature docker

See merge request !316
```
  0d69bf8f
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/sun into feature_docker · 5a281bfc
  wangpeng authored Aug 16, 2019
  
  5a281bfc
- docker构建完成 · c151c89a
  wangpeng authored Aug 16, 2019
  
  c151c89a