Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-09-17 164a3f35ff3fd9e5da60e450356e7e1f216142f4

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Welfare/OperationBase.cs

@@ -138,6 +138,7 @@
            else

            {

                var index = 0;

                bool equalCompare = false;

                for (int i = 0; i < times.Count; i++)

                {

                    if (times[i].InTime(time))

@@ -145,9 +146,10 @@
                        index = i;

                        break;

                    }

                    if (times[i].CompareTime(TimeUtility.ServerNow) == compare)

                    if (!equalCompare && times[i].CompareTime(TimeUtility.ServerNow) == compare)

                    {

                        index = i;

                        equalCompare = true;

                    }

                }

                return index;