Commit ac44eeed authored by 王源's avatar 王源 🎧

Merge branch 'master' into test

parents c443cea4 12945121
......@@ -120,14 +120,15 @@ class MessageHandler
* @param $title
* @throws HttpResponseException
*/
public function sendMarkDownText($receiverIds, $content,$title)
public function sendMarkDownText($receiverIds, $content, $title)
{
$application = $this->config->get('app_name');
if (!$application) {
throw new HttpResponseException("请设置应用名app_name");
}
$receiverIds = is_array($receiverIds) ? $receiverIds : [$receiverIds];
$this->messageService->SendMarkDownMessage($receiverIds, $application, 0, 0, [], $content,$title);
$sendUserId = Auth::id();
$this->messageService->SendMarkDownMessage($receiverIds, $application, 0, $sendUserId, [], $content, $title);
}
}
......@@ -174,14 +174,14 @@ interface StoreServiceInterface
public function checkStock($ids): array;
/**
* description:出库单 恢复库存 出库单定为已取消
* author: fuyunnan
* @param string $sourceNo 来源单号
* @return int
* @throws
* Date: 2020/9/7
*/
public function restoreStock($sourceNo): int;
// /**
// * description:出库单 恢复库存 出库单定为已取消
// * author: fuyunnan
// * @param string $sourceNo 来源单号
// * @return int
// * @throws
// * Date: 2020/9/7
// */
// public function restoreStock($sourceNo): int;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment