Merge remote-tracking branch 'origin/master'

liujie

2023-10-31 1c08cdb19aa0531dc77665dbbde052133dff9ceb

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

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

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


}