Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java

@@ -1,5 +1,6 @@
package com.dsh.course.feignClient.competition.model;

import io.swagger.models.auth.In;
import lombok.Data;

import java.math.BigDecimal;
@@ -16,5 +17,9 @@
    private BigDecimal amount;
    // 用户ids
    private List<Integer> userIds;

    // 筛选是平台 还是运营商 还是门店
    private Integer type;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}