Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -59,7 +59,7 @@ class ProductController extends BaseController
                 $v['category_id_text'] = $this->categoryName($v['category_id'],$cate_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
-                $v['is_renovation']  =  $this->getIsRenovation(Bemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
+                $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $v['url'] = $this->user['domain'].$v['route'].'/';
                 $lists['list'][$k] = $v;
             }