Merge remote-tracking branch 'origin/master'

nickchange

2023-10-27 200acf9283ff06e75874df263b1e125a71e76215

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java

@@ -24,6 +24,8 @@
    private Page<Map<String, Object>> page;
    private String cityCode;
    private Integer storeId;
    private Integer operatorId;


    private Integer objType;
}