From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
index 3013b98..718edc8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
@@ -141,6 +141,8 @@
         integralGoodsOfSearch.setActiveStatus(activeStatus);
         integralGoodsOfSearch.setState(state);
         integralGoodsOfSearch.setPage(page);
+        integralGoodsOfSearch.setObjType(UserExt.getUser().getObjectType());
+        integralGoodsOfSearch.setObjId(UserExt.getUser().getObjectId());
         return pointMercharsClient.ticketList(integralGoodsOfSearch);
     }
 

--
Gitblit v1.7.1