Merge branch 'develop'
* 解决 normal_offer_price 解析的情况.
Merge branch 'master' into develop