作者 李宇航

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

工单



查看合并请求 !2677
@@ -156,7 +156,7 @@ class TicketCount extends Command @@ -156,7 +156,7 @@ class TicketCount extends Command
156 * @method :post 156 * @method :post
157 * @time :2025/8/30 9:36 157 * @time :2025/8/30 9:36
158 */ 158 */
159 - public function manage_week_month_action($startOfLast,$endOfLast,$model = (new TicketWeekManageCount)){ 159 + public function manage_week_month_action($startOfLast,$endOfLast,$model){
160 $manageHrModel = new ManageHr(); 160 $manageHrModel = new ManageHr();
161 $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']); 161 $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
162 $ticketLogModel = new TicketLog(); 162 $ticketLogModel = new TicketLog();