Merge remote-tracking branch 'origin/dev-6.0' into dev-6.0

9cd5e4f1 · LiGuohua · fd2f4630 · 1a7cae9c · 9cd5e4f1 · 3af52b47
Commit 9cd5e4f1 authored Apr 13, 2020 by LiGuohua
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

PgPidParam.xaml.cs ...Y.Winder_20190413/FLY.Winder.UI.Client/PgPidParam.xaml.cs +1 -1

thick_public thick_public +1 -1

No files found.
--- a/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/PgPidParam.xaml.cs
+++ b/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/PgPidParam.xaml.cs
@@ -33,7 +33,7 @@ namespace FLY.Winder.UI.Client
        }

        [InjectionMethod]
-        void Init(IWinderSystemService winderSystem)
+        public void Init(IWinderSystemService winderSystem)
        {
            this.winderSystem = winderSystem;
            grid_winder.DataContext = winderSystem;

--- a/thick_public @ 3af52b47
+++ b/thick_public @ 3af52b47
-Subproject commit 68de2af9889ee81806f878dc27759ea59067ff61
+Subproject commit 3af52b4745114d8237751a4dc1db4d97eac42da2