Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -186,10 +186,14 @@
//        integers.add(2);
        integers.add(3);

        ArrayList<Integer> pays = new ArrayList<>();
        pays.add(2);
        pays.add(3);

        return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
                .in("payType",integers)
                .eq("appUserId",appUserId)
                .eq("payStatus",2));
                .in("payStatus",pays));
    }