Merge branch 'dev' into test

# Conflicts:
#	.idea/workspace.xml
#	config/ticket_config.yaml
#	init/select_ticket_info.py
#	tkcode

damatuCode/damatuWeb.py

@@ -124,4 +124,3 @@ class DamatuApi():
 # print(dmt.decode('tkcode', 287))  # 上传打码
 # # print(dmt.decodeUrl('https://kyfw.12306.cn/otn/passcodeNew/getPassCodeNew?module=login&rand=sjrand&0.7586344633015405', 310))  # 上传打码
 # # print(dmt.reportError('894657096')) # 上报错误
-

init/select_ticket_info.py

@@ -533,7 +533,7 @@ class select:
                 elif "messages" in queryOrderWaitTimeResult and queryOrderWaitTimeResult["messages"]:
                     print("排队等待失败： " + queryOrderWaitTimeResult["messages"])
                 else:
-                    print("第{}排队中,请耐心等待".format(num))
+                    print("第{}次排队中,请耐心等待".format(num))
             else:
                 print("排队中")
             time.sleep(2)