Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/command/NowReportHandle.php

@@ -429,7 +429,7 @@ class NowReportHandle extends Command
                                wp.apply_id as '业务部门',
                                wp.apply_name as '业务员',
                               wpo.cgder as '采购员',
-                               nake_fee '成本裸价',
+                               wpo.good_price '成本裸价',
                                wsm_type '仓库类型',
                                ws.name '供应商名称',
                                wwi.name '仓库名称'
@@ -481,7 +481,7 @@ class NowReportHandle extends Command
                                a.apply_id as '业务部门',
                                a.apply_name as '业务员',
                               wpo.cgder as '采购员',
-                               nake_fee '成本裸价',
+                               wpo.good_price '成本裸价',
                                wor.return_num  '出库退货数量',
                                wwi.wsm_type '仓库类型',
                                ws.name '供应商名称',