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

data/b2_herp3_bs/data

@@ -284,7 +284,7 @@ json_headers2: {
 "payload46": {"queryObject": {"goodsName": "","goodsMfrsName": "","purModes": [],"hosId": "h0347","branchId": "%s","grantRule": 1,"goodsSpec": "xhs"},"pageNum": 1, "pageSize": 50}
 "payload47": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 2,"branchId": "%s"}
 "payload47_2": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 3,"branchId": "%s"}
-
+"payload47_3": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 1,"branchId": "%s"}
 "payload48": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 3,"branchId": "%s"}
 "payload49": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 1,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
 "payload49_1": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 2,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}