Commits · 7369f0ed372528370e7ccf5016e0d1a7617dfb41 · alpha / sun

13 May, 2019 4 commits
- Merge branch 'haow/dev' into 'dev' · 7369f0ed
  王浩 authored May 13, 2019
```
fix code

See merge request !205
```
  7369f0ed
- fix code · 3bcb153c
  haowang authored May 13, 2019
  
  3bcb153c
- Merge branch 'haow/dev' into 'dev' · 4fd50559
  王浩 authored May 13, 2019
```
change delete api to mul

See merge request !204
```
  4fd50559
- change delete api to mul · 8c09f66e
  haowang authored May 13, 2019
  
  8c09f66e
10 May, 2019 6 commits
- Merge branch 'haow/dev' into 'dev' · 0f0cc071
  王浩 authored May 10, 2019
```
fix code about api

See merge request !203
```
  0f0cc071
- fix code about api · 11ef5e7a
  haowang authored May 10, 2019
  
  11ef5e7a
- Merge branch 'haow/dev' into 'dev' · af62df78
  王浩 authored May 10, 2019
```
add activity word parent beauty api

See merge request !202
```
  af62df78
- fix dev conflicts · 1397beca
  haowang authored May 10, 2019
  
  1397beca
- Merge branch 'master' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev · 3b0db7fd
  haowang authored May 10, 2019
  
  3b0db7fd
- add activity word parent beauty api · 84380b68
  haowang authored May 10, 2019
  
  84380b68
09 May, 2019 3 commits
- Merge branch 'haow/dev' into 'master' · db465f29
  王浩 authored May 09, 2019
```
add tag filter func

See merge request !196
```
  db465f29
- Merge branch 'ycl/like18' into 'dev' · a63d42f3
  杨成林 authored May 09, 2019
```
add is_repeat_read

See merge request !201
```
  a63d42f3
- add is_repeat_read · 7dea44b7
  yangchenglin authored May 09, 2019
  
  7dea44b7
08 May, 2019 4 commits
- Merge branch 'ycl/like18' into 'dev' · c37c13ad
  杨成林 authored May 08, 2019
```
fix

See merge request !200
```
  c37c13ad
- fix · 2763b3b7
  yangchenglin authored May 08, 2019
  
  2763b3b7
- Merge branch 'ycl/like18' into 'dev' · a608d901
  杨成林 authored May 08, 2019
```
BODY_ESTHETICS

See merge request !199
```
  a608d901
- BODY_ESTHETICS · b62f7b8a
  yangchenglin authored May 08, 2019
  
  b62f7b8a
07 May, 2019 8 commits
- fix tag filter list tag_id is str · e2ff46d6
  haowang authored May 07, 2019
  
  e2ff46d6
- modify tag filter delete to batch · 9ac79451
  haowang authored May 07, 2019
  
  9ac79451
- modify tag filter create support batch · a500ef19
  haowang authored May 07, 2019
  
  a500ef19
- add tag filter func · 4909c6ee
  haowang authored May 07, 2019
  
  4909c6ee
- Merge branch 'ycl/fix' into 'master' · 287cffc5
  王浩 authored May 07, 2019
```
fix recommend

See merge request !194
```
  287cffc5
- fix recommend · 70c5d4cd
  yangchenglin authored May 07, 2019
  
  70c5d4cd
- Merge branch 'ycl/like18' into 'dev' · 9d72d36c
  杨成林 authored May 07, 2019
```
Operation

See merge request !192
```
  9d72d36c
- Operation · 4b42d77e
  yangchenglin authored May 07, 2019
  
  4b42d77e
06 May, 2019 2 commits
- Merge branch 'haow/dev' into 'dev' · 958fc338
  王浩 authored May 06, 2019
```
Haow/dev

See merge request !191
```
  958fc338
- Merge branch 'test' into 'master' · 266cb0b3
  王浩 authored May 06, 2019
```
Alpha 1.7

See merge request !190
```
  266cb0b3
30 Apr, 2019 4 commits
- Merge branch 'ycl/fix' into 'test' · d21e7c3d
  杨成林 authored Apr 30, 2019
```
fix

See merge request !189
```
  d21e7c3d
- fix · 0b28666a
  yangchenglin authored Apr 30, 2019
  
  0b28666a
- Merge branch 'ycl/fix' into 'test' · 791ed5bc
  杨成林 authored Apr 30, 2019
```
fix

See merge request !188
```
  791ed5bc
- fix · 4f79d5fb
  yangchenglin authored Apr 30, 2019
  
  4f79d5fb
28 Apr, 2019 6 commits
- Merge branch 'haow/dev' into 'master' · 8a19859e
  王浩 authored Apr 28, 2019
```
fix

See merge request !187
```
  8a19859e
- fix · 6466ec2e
  haowang authored Apr 28, 2019
  
  6466ec2e
- Merge branch 'haow/dev' into 'master' · bf53e2ef
  王浩 authored Apr 28, 2019
```
fix api params to json

See merge request !186
```
  bf53e2ef
- fix api params to json · 417fe632
  haowang authored Apr 28, 2019
  
  417fe632
- Merge branch 'haow/dev' into 'master' · b73eac41
  王浩 authored Apr 28, 2019
```
tools api add post params to suit more data form

See merge request !185
```
  b73eac41
- tools api add post params to suit more data form · 13353ac3
  haowang authored Apr 28, 2019
  
  13353ac3
26 Apr, 2019 3 commits
- Merge branch 'haow/dev' into 'master' · f864ce07
  王浩 authored Apr 26, 2019
```
sun user add roles fix topic create api add cut_word_tag_ids

See merge request !182
```
  f864ce07
- Merge branch 'haow/dev' into 'test' · 9089e275
  王浩 authored Apr 26, 2019
```
add roles in login get method

See merge request !184
```
  9089e275
- add roles in login get method · 24552ea0
  haowang authored Apr 26, 2019
  
  24552ea0