Merge remote-tracking branch 'origin/master'

nickchange

2023-10-16 6593a67fdfb688c70365b419c0e9658c690524b5

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

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

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

}