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

client_linchunjie

2019-03-14 eedeb8a020fce13e0e63ad7c57adfdff7578e875

 System/Compose/New/GuardComposeConfirmWin.cs

@@ -124,7 +124,7 @@
            bool isShow = model.config.ExpireTime > 0;

            if (isShow)

            {

                List<int> itemEffectTime = model.GetUseDataModel((int)ItemUseDataKey.createTime);

                List<int> itemEffectTime = model.GetUseData((int)ItemUseDataKey.createTime);

                seconds = model.config.ExpireTime;

                if (itemEffectTime != null && itemEffectTime[0] != 0 && model.guid != "")

                {