fe / yohobuy-shop-fe2 · Commits

# Conflicts:
#	dist/yohobuy-shops-fe/4.8.3/jquery/goods.price.Change.js
#	dist/yohobuy-shops-fe/4.8.3/jquery/shop.Decoration.js
#	dist/yohobuy-shops-fe/4.8.3/vue/libs.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.BusinessOverview.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.BusinessSale.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.Charts.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.ImportExportStock.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.Stock.js
#	server/index.js
#	server/interfaces/goods.price.js

# By Zhongw (3) and 徐洪云 (1)
# Via Zhongw (1) and 徐洪云 (1)
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-shop-fe2:
  更新会话超时时长
  店铺装修提示信息
  变价隐藏筛选
  销售类目图片bug

# Conflicts:
#	code/static/js.jquery/module/shop/ShopCategory/Edit.js

# By Zhongw
# Via Zhongw
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-shop-fe2:
  学生价隐藏
  商家端隐藏学生价

# By 徐洪云
# Via 徐洪云
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-shop-fe2:
  修改线上会员画像显示不了的问题