ignore update
内部串货入库，将发票号转入入库单备注
Merge branch 'master' of https://github.com/wenyangw/lnyswz.git
查询表结构调整
采购计划列表中入库标识
开票备注加入提货单流水号
Merge branch 'fix-select'
查询表结构调整
采购计划列表中入库标识
开票备注加入提货单流水号
商品列表中显示含税单价
Merge branch 'develop'

Conflicts:
	resources/config.properties
发票备注修改bug
Merge branch 'develop'
大连提货单样式调整
Merge branch 'develop'
大连提货单bug
Merge branch 'develop'
库房入库样式调整
Merge branch 'develop'
库房入库打印调整
商品列表中单价不含税
Merge branch 'develop'
字典bug修复