Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into develop
# Conflicts: # MECF.Framework.Common/Aitex/Core/Account/Credential.cs
This commit is contained in:
commit
22e206d5ce
# Conflicts: # MECF.Framework.Common/Aitex/Core/Account/Credential.cs