浏览代码

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

wufeng 2 年之前
父节点
当前提交
7ebc60ea13
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      app/admin/controller/Good.php

+ 2 - 2
app/admin/controller/Good.php

@@ -121,9 +121,9 @@ class Good extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')
             ->alias("a")
-            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status,gn.creater_id purchase_id,gn.creater purchase")//成本表里的创建人,也是线上商品的采购人,为了防止混淆,给creater取个别名
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status,gb.createrid purchase_id,gb.creater purchase")//成本表里的创建人,也是线上商品的采购人,为了防止混淆,给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
-            ->leftJoin("good_nake gn","gn.spuCode=a.spuCode")
+            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
             ->where($where)
             ->page($page,$size)
             ->order("b.addtime desc")