dev #3

Merged
weiz merged 5 commits from dev into master 2023-10-16 10:41:43 +08:00
1 changed files with 1 additions and 5 deletions
Showing only changes of commit 0b6b29a77b - Show all commits

View File

@ -124,11 +124,7 @@ class SuYuanController extends BaseAdminController
}
$data = Db::name('environmental_data')->where('production_base_id',$params['id'])->where('flag',$params['flag'])->limit(6)->select();
$content = Db::name('production_base')->where('id',$params['id'])->field('content')->findOrEmpty();
$result = [];
foreach ($data as $v) {
}
dump($data);die;
return $this->success('请求成功',['data'=>$data,'content'=>$content['content']]);
}
//上传图片