|
@@ -296,10 +296,9 @@ class MBaseModel
|
|
|
}
|
|
|
if((isset($value['extends']) && !empty($value['extends'])) || (isset($value['extend']) && !empty($value['extend']))){
|
|
|
if(isset($value['extend'])){
|
|
|
- var_dump($value['extend']);
|
|
|
- $extends = json_decode($value['extend'], true);
|
|
|
+ $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extend'], true);
|
|
|
}else if(isset($value['extends'])){
|
|
|
- $extends = json_decode($value['extends'], true);
|
|
|
+ $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extends'], true);
|
|
|
}else{
|
|
|
$extends = [];
|
|
|
}
|