合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2556

@@ -16,6 +16,7 @@ use App\Models\Ticket\TicketDailyCount;
 use App\Models\Ticket\TicketDailyDeptCount;
 use App\Models\Ticket\TicketDailyDeptCount;
 use App\Models\Ticket\TicketDailyManageCount;
 use App\Models\Ticket\TicketDailyManageCount;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketLog;
+use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
 
 
@@ -76,7 +77,7 @@ class TicketLogic extends BaseLogic
      */
      */
     public function getTicketList(){
     public function getTicketList(){
         $ticketsList = Tickets::select(['project_id','title','end_at','end_time','id'])->inRandomOrder()->limit(20)->get();
         $ticketsList = Tickets::select(['project_id','title','end_at','end_time','id'])->inRandomOrder()->limit(20)->get();
-        $projectModel = new Project();
+        $projectModel = new TicketProject();
         $ticketLogModel = new TicketLog();
         $ticketLogModel = new TicketLog();
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         foreach ($ticketsList as $key => $item){
         foreach ($ticketsList as $key => $item){