Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/GoodOfflineLog.php

@@ -36,7 +36,7 @@ class GoodOfflineLog extends Base
             }
         }
 
-        $count = Db::name('good_offline_log')->alias("a")->where($where)->count('id');
+        $count = Db::name('good_offline_log')->alias("a")->leftJoin("good_basic b","a.spuCode=b.spuCode")->where($where)->count('id');
         $list = Db::name('good_offline_log')->alias("a")
             ->field('a.id,a.spuCode,a.good_name,a.creater,a.addtime,a.createrid,b.companyNo,b.supplierNo')
             ->leftJoin("good_basic b","a.spuCode=b.spuCode")