Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

 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);
    }