Merge branch 'master' into develop

src/app/views/fuwutai/fuwutai.component.ts

@@ -1955,7 +1955,7 @@ export class FuwutaiComponent implements OnInit {
       if(stateId == 1){
         postData.incidentQuery.incident = {
           // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-          "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+          "acceptDutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "storageAccept",
           "assignee": this.tool.getCurrentUserId(),