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

air_case/b2_herp3_bs/r_d9库房管理_库区设置_货位管理_编辑货位.air/r_d9库房管理_库区设置_货位管理_编辑货位.py

@@ -103,4 +103,4 @@ def test1(dept_id='d69a68df361a4289b2262e4ef75b55a5', stockId='c66b6ed38dbb4fbc8
 
 test1()
 #删除货位,库区
-delData().Delete_probeInfo()
\ No newline at end of file
+# delData().Delete_probeInfo()
\ No newline at end of file

data/a2_mdm3_ea/data

@@ -6,7 +6,7 @@
 "upCompanyList_url": "/api/mdmService/mdmCompany/upCompanyList"
 "auditCompanyRegistBill_url": "/api/mdmService/companyRegistBill/auditCompanyRegistBill"
 "updateByIdCompanyRegistBill_url": "/api/mdmService/companyRegistBill/updateById/"
-"username": "test001"
+"username": "test_1"
 "password": "1qaz!QAZ"
 
 json_contentType: "application/json"