ignore update
feature audit update
Merge branch 'fixbug' into feature-audit
内部串货入库，将发票号转入入库单备注
test
查询表结构调整
采购计划列表中入库标识
开票备注加入提货单流水号
Merge branch 'fix-select' into feature-audit
Merge branch 'develop' into feature-audit

Conflicts:
	resources/config.properties
Merge branch 'develop' into feature-audit
编写销售回款后台代码
Merge branch 'develop' into feature-audit
Merge branch 'develop' into feature-audit
Merge branch 'develop' into feature-audit
==
Merge branch 'develop' into feature-audit
==
Merge branch 'develop' into feature-audit
==
Merge branch 'develop' into feature-audit
继续编写销售回款代码