Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into shipanpan

Shipanpan

See merge request !35

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into shipanpan

Shipanpan

See merge request !34

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into shipanpan

Shipanpan

See merge request !33

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into shipanpan

运动评价保存判断条件bug修改

See merge request !32

Wuying

See merge request !31

申请页面

See merge request !30

改coach_id,点击课程完结接口对接

See merge request !29

保存运动评价条件判断

See merge request !28

Shipanpan

See merge request !27

Wuying

See merge request !26

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying

Wuying

See merge request !25

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying

Wuying

See merge request !24

保存教练评语及各项分数接口对接，家长回复，城市列表，科目列表接口对接

See merge request !23

# Conflicts:
#   pages/index/classDetail/classDetail.wxml

Wuying

See merge request !22