# Conflicts:
# client/js/basegoods/edit.js
# client/js/common/common.js
# client/js/common/popImg.js
# client/js/goods/partials/editor_recommend.js
# client/js/goods/price-change.js
# client/js/goods/shelf_audit/index.js
# client/js/operations/staticFileManager.js
# client/js/sourceManage/resourceContentManage.js
# server/config/common.js
# server/config/searchApi.js
# server/interface/basegoods.js
# server/interface/common_select.js
# server/interface/goods.js
# server/interface/searchWords.js
# server/mid/auth.js
# server/stub/service/auth.js
# server/stub/service/upload.js
# server/views/pages/basegoods/edit.html
# server/views/partials/resource/taoyu2.html
