hexiugang/iamberry-common-parent: iamberry-common-parent @ 2c6ad5b6037ed07ccc7e7c74a828da481e977a76

liujiankang 2c6ad5b603 Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent		7 rokov pred
..
batch	6efb0a2419 修改rst bug	7 rokov pred
bom	6efb0a2419 修改rst bug	7 rokov pred
device	dd6d63cc6f 所有列表搜索下拉框字体改为黑色	7 rokov pred
employee	8fec584f3f 修改何秀刚测试bug	7 rokov pred
machine	2c6ad5b603 Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent	7 rokov pred
machinePtras	6efb0a2419 修改rst bug	7 rokov pred
machineVersion	0cdce6aa2c bug修复	7 rokov pred
produce	0cdce6aa2c bug修复	7 rokov pred
supplier	8fec584f3f 修改何秀刚测试bug	7 rokov pred