conflict fix

9e0a7af8 · 朱璇 · 3d2d9451 · 9e0a7af8
Commit 9e0a7af8 authored Jul 12, 2020 by 朱璇
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

PlanCompareDetailPage.dart ...ueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart +1 -1

No files found.
--- a/lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
+++ b/lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
@@ -41,7 +41,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {

  @override
  void initState() {
-//    DioUtil.getInstance().setProxy("172.30.9.128");
+    //  DioUtil.getInstance().setProxy("172.30.9.128");
    super.initState();
    _model.init(widget._planIds);
  }