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

2025-12-02 16:47:03 +08:00
parent abf611d725 a82ef834b4
commit f1da50de78
13 changed files with 258 additions and 186 deletions
--- a/application/adminapi/controller/SingerSong.php
+++ b/application/adminapi/controller/SingerSong.php
@@ -47,6 +47,11 @@ class SingerSong extends adminApi
            ->where($where)
            ->page($page, $page_limit)
            ->select();
+        if($list){
+            foreach ($list as &$v){
+                $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
+            }
+        }
        $return_data = [
            'page' =>$page,
            'page_limit' => $page_limit,