fe / YOHOBUYWAP · Commits

Go to a project

Authored by cailing
Commit f2109bb938c40d15a9f57851a65189605a531ff9 1 parent 8762eb4c

修改

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
@@ -41,10 +41,6 @@ class DetailModel @@ -41,10 +41,6 @@ class DetailModel
41 elseif (is_numeric($productSkn)) { 41 elseif (is_numeric($productSkn)) {
42 $baseInfo = DetailData::baseInfo(null, $uid, $productSkn); 42 $baseInfo = DetailData::baseInfo(null, $uid, $productSkn);
43 } 43 }
44 -<<<<<<< HEAD  
45 -=======  
46 - // print_r($baseInfo);  
47 ->>>>>>> feature/orderdetail  
48 // 商品名称 44 // 商品名称
49 if (empty($baseInfo['productName'])) { 45 if (empty($baseInfo['productName'])) {
50 return $result; 46 return $result;