# Conflicts: # code/apps/goods/views/basegoods/Batch.html # code/static/js.jquery/module/goods/basegoods/Batch.js