Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -132,7 +132,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	/**
 	 * 客服异常工单  查询营业部责任人人员信息
 	 */
-	@GetMapping("/getCustomerServicePersonnel")
+	@GetMapping("/getBusinessDepartmentUser")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询营业部责任人人员信息", notes = "传入aftersalesWorkOrder")
 	public R<List<User>> getBusinessDepartmentUser(Long warehouseId) {