Merge branch 'master' into kg_master

# Conflicts:
#	OSS.Common/ComUtils/NumGenerator.cs
This commit is contained in:
LongX
2019-04-18 13:31:07 +08:00
-1
View File
@@ -173,7 +173,6 @@ namespace OSS.Common.ComUtils
}
private static readonly long _timeStartTicks = new DateTime(2018, 1, 1).ToUniversalTime().Ticks;
/// <summary>