xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/mzl_dev' into develop

Browse Source 
# Conflicts:
#	app/admin/service/SysDictService.php
This commit is contained in:
mzl
2025-09-09 13:47:04 +08:00
parent 2cd613eea6
commit f5e93f2400
23 changed files with 1929 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ApprovalFlowsController.php
+8 -8
View File
@@ -22,14 +22,14 @@ class ApprovalFlowsController extends BaseController
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
return $data;
}
// protected function indexFormat($data)
// {
// if (isset($data['created_at']))
// $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
// if (isset($data['updated_at']))
// $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
// return $data;
// }
public function desc()