fix conflix
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao
Merge branch 'master' of http://gitlab.xibao100.com/development-team/staticfiles-xibao