fe / yohobuy-portal-fe2 · Commits

物理分类的图片没有地方可以维护

# Conflicts:
#	code/static/js.jquery/common/upload.js

# Conflicts:
#	code/apps/goods/controllers/basegoods.js
#	code/apps/shop/views/Edit.html

# Conflicts:
#	code/apps/goods/controllers/basegoods.js
#	server/controllers/goods.basegoods.js
#	server/interfaces/goods.basegoods.js
#	server/views/goods/batchUpdateStudentPrice/Batch.html
#	server/views/shop/Edit.html

# By 徐洪云
# Via 徐洪云
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2:
  fix bug

# By lijian (2) and 徐洪云 (1)
# Via lijian
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2:
  网销bug修复
  no message
  fix bug