Merge remote-tracking branch 'origin/master'

44323

2023-09-26 7aa9607492e2c0b70838c53083f5362e49e74f44

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

@@ -22,5 +22,8 @@
    private Integer state;

    private Page<Map<String, Object>> page;
    private String cityCode;
    private Integer storeId;


}