Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-19 4a9318077bd095fbc7c57c593e5ca8185603dac4

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

old mode 100644
new mode 100755
@@ -228,7 +228,12 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = function.collect
            };
            bodyDiv.AddChidren(btnCollectionIcon);
            //bodyDiv.AddChidren(btnCollectionIcon);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                bodyDiv.AddChidren(btnCollectionIcon);
            }
        }

        /// <summary>