Commit f4944c56 authored by jianghaiming's avatar jianghaiming

update:修改冲突

parent 13bdfa82
......@@ -68,6 +68,7 @@ class Goods implements DaemonServiceInterface
'online_status' => [0,2],
'audit_status' => 1,
'online_start_time[<]' => date("Y-m-d H:i:s",time()),
'online_end_time[>]' => date("Y-m-d H:i:s",time()),
'LIMIT' => 100,
];
$goodsList = GoodsSku::getRecords($orderData);
......
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