合并v2.1.5功能到develop,包括结算二次确认,打印连打添加时间间隔
This will create a new commit in order to revert the existing changes.