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

app/common.php

@@ -433,7 +433,7 @@ function made_youzan(int $yz_cat_id=0,$data=[]){
     if(empty($rs)) return [];
 
     $vmn =[];
-    $vmn['yz_cat_id'] =$rs['yz_cat_id'];
+    $vmn['yz_cat_id'] =$rs['id'];
     $vmn['yz_cat_name'] =$rs['yz_cat_name'];
     array_unshift($data,$vmn);
 
@@ -450,8 +450,8 @@ if(!function_exists('get_yz_cat_info')){
         if(!$rs){
             $rs = Db::connect('mysql_yz')
                 ->table('yz_cat')
-                ->field('id,yz_cat_id,yz_cat_name,parent_cid')
-                ->where(['yz_cat_id'=>$yz_cat_id,'status'=>1])
+                ->field('id,yz_cat_name,parent_cid')
+                ->where(['id'=>$yz_cat_id,'status'=>1])
                 ->findOrEmpty();
             if($rs)  \think\facade\Cache::set($key,$rs,36000);
         }