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

# Conflicts:
#	air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

@@ -374,8 +374,8 @@ def main():
         center_Stock_unpack(1)  # 低值耗材扫码发放
         center_Stock_unpack(3)  # 试剂耗材扫码发放
         commonFuc().check_text_exist_result_text('succees', 'succees')
-        print('================流程十八执行完毕===================')
+        print('================流程十八执行完毕===================1')
 
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
-main()
+# main()
\ No newline at end of file