Commit 4c7a59cf authored by suntengda's avatar suntengda

Merge branch 'tuancan' into develop

parents efb09faf f0854640
...@@ -54,7 +54,8 @@ class Pindan implements DaemonServiceInterface ...@@ -54,7 +54,8 @@ class Pindan implements DaemonServiceInterface
$params = [ $params = [
self::emojiFilter($marketing['marketing_name']), self::emojiFilter($marketing['marketing_name']),
$marketing['start_time'], $marketing['start_time'],
$pindan['pindan_desc'] ?: self::DEFAULT_DESC $pindan['pindan_desc'] ?: self::DEFAULT_DESC,
$marketing['marketing_id']
]; ];
//发送消息 //发送消息
......
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