解决冲突

8fb1512f · mengcuiguang · 775481e4 · 8fb1512f
Commit 8fb1512f authored Feb 25, 2021 by mengcuiguang
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

MyFragment.kt ...c/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt +1 -0

No files found.
--- a/GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
+++ b/GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
@@ -719,6 +719,7 @@ class MyFragment : BaseFragment(),
                                0 -> {
                                    // 牧场人生包名
                                    pkgMCRSCarrier = Constant.CARRIER_MC_FIRSTDOWNLOAD
+                                    pkgMCRSKey=""
                                    pkgMCRSName = taskBean.otherConfig.pkg

                                    // 下载牧场人生