Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

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

@@ -16,5 +16,5 @@
    private BigDecimal amount;
    // 用户ids
    private List<Integer> userIds;

    private Integer insertType;
}