From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/communityWorldCup/model/GetWorldCupPayment.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/communityWorldCup/model/GetWorldCupPayment.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/communityWorldCup/model/GetWorldCupPayment.java
index 850275a..29f6290 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/communityWorldCup/model/GetWorldCupPayment.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/communityWorldCup/model/GetWorldCupPayment.java
@@ -18,7 +18,7 @@
     /**
      * 支付方式（0=免费，1=微信，2=支付宝，3=玩湃币，4=课时）
      */
-    private Integer payType;
+    private String payType;
     /**
      * 开始时间
      */

--
Gitblit v1.7.1