occur error
Merge branch 'origin/develop'
add item field
add batch field
add batchGrid field
add batch field
#61 欄位皆已新增 除batch中supplier需待supplier maintan完成
Merge branch 'origin/adjustField'

Conflicts:
	extjs-app/foodprint.xds