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

This commit is contained in:
chenbo 2023-09-11 11:58:37 +08:00
commit 2a9b4dedd7

View File

@ -63,9 +63,9 @@ class TaskController extends BaseApiController
if($time<time()){
$transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
if($transaction_pool==0){
$find['transaction_pool']=0;
$find['arr']['transaction_pool']=0;
}else{
$find['transaction_pool']=$transaction_pool;
$find['arr']['transaction_pool']=$transaction_pool;
}
$res[$k]['extend']['transaction'] = $find;
}