Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -1593,6 +1593,18 @@ class Consult extends Base
                     ->whereIn('status', [5, 6])
                     ->find();
             }
+
+
+            //产地
+            if($value['origin_place']!=''){
+                $code = explode(",",$value['origin_place']);
+                $temp=[];
+                $temp['provice_code']=isset($code[0])?$code[0]:"";
+                $temp['city_code']=isset($code[1])?$code[1]:"";
+                $temp['area_code']=isset($code[2])?$code[2]:"";
+                $addr= GetAddr(json_encode($temp));
+                $value['origin_addr'] = $addr;
+            }
             $data[] = $value;
         }
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);