git dir remove
Merge branch 'master' of github.com:vegeden/dealer
shelves input 修改
Merge branch 'master' of github.com:vegeden/dealer

Conflicts:
	.gitignore
Merge branch 'master' of github.com:vegeden/dealer
controllers/backend/commodity.php
 function onitemAddEdit 修改
commodity_lang.php
 $lang['commodity_yes'] 新增
 $lang['commodity_no'] 新增
 $lang['commodity_special_item'] 新增
 $lang['commodity_special_explain'] 新增
models/db/items_information.php
 function Select 修改
 function SelectShelves 修改
views/backend/commodity/itemAdd.php 修改
views/backend/commodity/itemEdit.php 修改
views/backend/commodity/itemList.php 修改
Merge branch 'master' of github.com:vegeden/dealer