Merge branch 'hcy_pcb_20181221-r' into development

app/Http/Controllers/WebController.php

@@ -2,9 +2,9 @@
 
 
 namespace App\Http\Controllers;
 namespace App\Http\Controllers;
 
 
-use App\map\PcbOrderInvoiceMap;
-use App\map\PcbOrderMap;
-use App\map\PcbOrderShippingMap;
+use App\Map\PcbOrderInvoiceMap;
+use App\Map\PcbOrderMap;
+use App\Map\PcbOrderShippingMap;
 use App\Model\PaymentDaysModel;
 use App\Model\PaymentDaysModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 

app/Map/PcbOrderInvoiceMap.php

 <?php
 <?php
-namespace App\map;
+namespace App\Map;
 
 
 class PcbOrderInvoiceMap{
 class PcbOrderInvoiceMap{
     //发票类型 2普通发票 3增值税专用发票 4增值税普通发票',
     //发票类型 2普通发票 3增值税专用发票 4增值税普通发票',

app/Map/PcbOrderMap.php

 <?php
 <?php
-namespace App\map;
+namespace App\Map;
 
 
 class PcbOrderMap{
 class PcbOrderMap{
     //类型 ：1付预付款单 2退预付款单 3收款 4付款
     //类型 ：1付预付款单 2退预付款单 3收款 4付款

app/Map/PcbOrderShippingMap.php

 <?php
 <?php
-namespace App\map;
+namespace App\Map;
 
 
 class PcbOrderShippingMap{
 class PcbOrderShippingMap{
     //发货信息：-1 未配送 1 配送中 2 已签
     //发货信息：-1 未配送 1 配送中 2 已签

app/Model/Pcb/PcbActionLogModel.php

@@ -2,7 +2,7 @@
 
 
 namespace App\Model\Pcb;
 namespace App\Model\Pcb;
 
 
-use App\map\PcbOrderMap;
+use App\Map\PcbOrderMap;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 use Request;
 use Request;
 use DB;
 use DB;

app/Model/Pcb/PcbOrderModel.php

@@ -2,7 +2,7 @@
 
 
 namespace App\Model\Pcb;
 namespace App\Model\Pcb;
 
 
-use App\map\PcbOrderMap;
+use App\Map\PcbOrderMap;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 use Request;
 use Request;
 use DB;
 use DB;

app/Model/Pcb/PcbPurchaseModel.php

@@ -2,7 +2,7 @@
 
 
 namespace App\Model\Pcb;
 namespace App\Model\Pcb;
 
 
-use App\map\PcbOrderMap;
+use App\Map\PcbOrderMap;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 use Request;
 use Request;
 use DB;
 use DB;