Browse Source

解决冲突

newui
Link.Zhao 2 years ago
parent
commit
5ec3369478
  1. 1
      designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

1
designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@ -478,6 +478,7 @@ public class UpdateMainDialog extends UIDialog {
updateTimeStr = updateInfo[UpdateInfoTable.UPDATE_DATE_INDEX];
Date updateTime = UPDATELOG_FORMAT.parse(updateTimeStr);
//形如 Build#release-2018.07.31.03.03.52.80
String currentNO = GeneralUtils.readBuildNO();
Date curJarDate = UPDATE_INFO_TABLE_FORMAT.parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1));

Loading…
Cancel
Save