Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

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

@@ -2,8 +2,10 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.activity.feignclient.other.model.TOperatorCity;
import lombok.Data;

import java.util.List;
import java.util.Map;

@Data
@@ -25,7 +27,8 @@
    private String cityCode;
    private Integer storeId;
    private Integer operatorId;


    private Integer objType;
    private List<Integer> storeIds;
    // 运营商使用
    private List<TOperatorCity> operatorCities;
}