正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -36,10 +36,10 @@ class BTemplateModuleLogic extends BaseLogic | @@ -36,10 +36,10 @@ class BTemplateModuleLogic extends BaseLogic | ||
| 36 | foreach ($list as $k1 => $v1){ | 36 | foreach ($list as $k1 => $v1){ |
| 37 | foreach ($label_arr as $v2){ | 37 | foreach ($label_arr as $v2){ |
| 38 | if($v2['template_id'] == $v1['id']){ | 38 | if($v2['template_id'] == $v1['id']){ |
| 39 | - $v1['label'] = $v2; | ||
| 40 | - $list[$k1] = $v1; | 39 | + $v1['label'][] = $v2; |
| 41 | } | 40 | } |
| 42 | } | 41 | } |
| 42 | + $list[$k1] = $v1; | ||
| 43 | } | 43 | } |
| 44 | return $this->success($list); | 44 | return $this->success($list); |
| 45 | } | 45 | } |
-
请 注册 或 登录 后发表评论