Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/IntegralGoodsOfSearch.java

@@ -26,4 +26,8 @@
    private Integer state;

    private Page<Map<String, Object>> page;

    private Integer objType;

    private Integer objId;
}