Commits · a73146793b0fe9c111b140883f12f547359f06a6 · 钟尚武 / sun

22 Mar, 2019 14 commits
- Merge branch 'haow/dev' into 'test' · a7314679
  王浩 authored Mar 22, 2019
```
fix code user list

See merge request alpha/sun!136
```
  a7314679
- fix code user list · 72cc73d0
  王浩 authored Mar 22, 2019
  
  72cc73d0
- Merge branch 'haow/dev' into 'test' · c1ac5a8e
  王浩 authored Mar 22, 2019
```
fix

See merge request alpha/sun!135
```
  c1ac5a8e
- fix · 2494af84
  王浩 authored Mar 22, 2019
  
  2494af84
- Merge branch 'haow/dev' into 'test' · c6f4b279
  王浩 authored Mar 22, 2019
```
fix user search

See merge request alpha/sun!134
```
  c6f4b279
- fix user search · b5a61eb0
  王浩 authored Mar 22, 2019
  
  b5a61eb0
- Merge branch 'haow/dev' into 'test' · e6c1e0b0
  王浩 authored Mar 22, 2019
```
fix pictorial user list

See merge request alpha/sun!132
```
  e6c1e0b0
- Merge branch 'test' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev · a9f47248
  王浩 authored Mar 22, 2019
  
  a9f47248
- fix pictorial user list · 501e498d
  王浩 authored Mar 22, 2019
  
  501e498d
- Merge branch 'hotfix/del_question' into 'test' · 488a6950
  李延哲 authored Mar 22, 2019
```
获取运营配置信息

See merge request alpha/sun!131
```
  488a6950
- 获取运营配置信息 · ada2d351
  李延哲 authored Mar 22, 2019
  
  ada2d351
- Merge branch 'hotfix/del_question' into 'test' · 8722e6e9
  李延哲 authored Mar 22, 2019
```
问题修改

See merge request alpha/sun!130
```
  8722e6e9
- Merge branch 'test' into hotfix/del_question · 79984d27
  李延哲 authored Mar 22, 2019
  
  79984d27
- sun接口实现 · feadb4ca
  李延哲 authored Mar 22, 2019
  
  feadb4ca
21 Mar, 2019 10 commits
- 问题修改 · ce15fcb5
  李延哲 authored Mar 21, 2019
  
  ce15fcb5
- Merge branch 'haow/dev' into 'test' · 1682a6ae
  王浩 authored Mar 21, 2019
```
fix

See merge request alpha/sun!129
```
  1682a6ae
- fix code conflicts · 3040a6c4
  王浩 authored Mar 21, 2019
  
  3040a6c4
- fix · a660591c
  王浩 authored Mar 21, 2019
  
  a660591c
- Merge branch 'haow/dev' into 'test' · ca13dc89
  王浩 authored Mar 21, 2019
```
fix

See merge request alpha/sun!128
```
  ca13dc89
- fix · 43488d88
  王浩 authored Mar 21, 2019
  
  43488d88
- Merge branch 'haow/dev' into 'test' · 26de98af
  王浩 authored Mar 21, 2019
```
fix code

See merge request alpha/sun!127
```
  26de98af
- fix code · 9890791a
  王浩 authored Mar 21, 2019
  
  9890791a
- Merge branch 'haow/dev' into 'test' · 483f496f
  王浩 authored Mar 21, 2019
```
fix code

See merge request alpha/sun!126
```
  483f496f
- fix code · 97970a68
  王浩 authored Mar 21, 2019
  
  97970a68
19 Mar, 2019 16 commits
- Merge branch 'feature/op_topic' into 'master' · 7f2cb548
  zhanglu authored Mar 19, 2019
```
Feature/op topic

See merge request alpha/sun!123
```
  7f2cb548
- Merge branch 'haow/dev' into 'master' · a3f5dbf9
  zhanglu authored Mar 19, 2019
```
pictorial backend

See merge request alpha/sun!124
```
  a3f5dbf9
- Merge branch 'feature/op_topic' into 'test' · 9b34b377
  zhanglu authored Mar 19, 2019
```
添加画报id

See merge request alpha/sun!122
```
  9b34b377
- 添加画报id · ee322a13
  zhanglu authored Mar 19, 2019
  
  ee322a13
- Merge branch 'haow/dev' into 'test' · 629e8d26
  王浩 authored Mar 19, 2019
```
fix user is_tcc update

See merge request alpha/sun!121
```
  629e8d26
- fix user is_tcc update · 21705bc8
  王浩 authored Mar 19, 2019
  
  21705bc8
- Merge branch 'haow/dev' into 'test' · 730857a3
  王浩 authored Mar 19, 2019
```
fix user is_tcc and pictorial create faild message

See merge request alpha/sun!119
```
  730857a3
- fix user is_tcc and pictorial create faild message · a4c519c0
  王浩 authored Mar 19, 2019
  
  a4c519c0
- Merge branch 'dev' into 'test' · 3b838e97
  王浩 authored Mar 19, 2019
```
Dev

See merge request alpha/sun!117
```
  3b838e97
- Merge branch 'haow/dev' into 'dev' · f4952afd
  王浩 authored Mar 19, 2019
```
create pictorial add tag info

See merge request alpha/sun!116
```
  f4952afd
- create pictorial add tag info · e61f60b3
  王浩 authored Mar 19, 2019
  
  e61f60b3
- Merge branch 'dev' into 'test' · ae1cd105
  zhanglu authored Mar 19, 2019
```
Dev

See merge request alpha/sun!114
```
  ae1cd105
- Merge branch 'feature/op_topic' into 'test' · 28ff8528
  zhanglu authored Mar 19, 2019
```
Feature/op topic

See merge request alpha/sun!115
```
  28ff8528
- Merge branch 'feature/op_topic' into 'dev' · 48e4f926
  zhanglu authored Mar 19, 2019
```
fix

See merge request alpha/sun!113
```
  48e4f926
- fix · 18126fb0
  zhanglu authored Mar 19, 2019
  
  18126fb0
- Merge branch 'haow/dev' into 'dev' · 93f10b5a
  王浩 authored Mar 19, 2019
```
fix code

See merge request alpha/sun!110
```
  93f10b5a