Commit 97059abd authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/master' into core_flow

# Conflicts:
#	data/b5_spd3_core_business_flow/message
#	data/b5_spd3_core_business_flow/message1
#	data/b5_spd3_core_business_flow/message2
parent 0c76f1a8
......@@ -887,4 +887,4 @@ def main():
print('==========================流程十一结束==============================')
except:
commonFuc().check_text_exist_result_text('error', '1')
# main()
main()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment