Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop
正在显示
2 个修改的文件
包含
1 行增加
和
3 行删除
| @@ -24,8 +24,6 @@ class ATemplateController extends BaseController | @@ -24,8 +24,6 @@ class ATemplateController extends BaseController | ||
| 24 | */ | 24 | */ |
| 25 | public function lists(ATemplateLogic $aTemplateLogic){ | 25 | public function lists(ATemplateLogic $aTemplateLogic){ |
| 26 | $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order); | 26 | $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order); |
| 27 | - var_dump($lists); | ||
| 28 | - die(); | ||
| 29 | $this->response('success',Code::SUCCESS,$lists); | 27 | $this->response('success',Code::SUCCESS,$lists); |
| 30 | } | 28 | } |
| 31 | /** | 29 | /** |
| @@ -57,7 +57,7 @@ class ProjectLogic extends BaseLogic | @@ -57,7 +57,7 @@ class ProjectLogic extends BaseLogic | ||
| 57 | 'type' => $this->model::typeMap()[$item['type']] ?? '', | 57 | 'type' => $this->model::typeMap()[$item['type']] ?? '', |
| 58 | 'test_domain' => $item['deploy_build']['test_domain'] ?? 0, | 58 | 'test_domain' => $item['deploy_build']['test_domain'] ?? 0, |
| 59 | 'domain' => $item['deploy_optimize']['domain'] ?? 0, | 59 | 'domain' => $item['deploy_optimize']['domain'] ?? 0, |
| 60 | - 'crated_at' => date('Y年m月d日', strtotime($item['created_at'])), | 60 | + 'created_at' => date('Y年m月d日', strtotime($item['created_at'])), |
| 61 | ]; | 61 | ]; |
| 62 | } | 62 | } |
| 63 | return $list; | 63 | return $list; |
-
请 注册 或 登录 后发表评论