Pull request #7314: merge conflict

Merge in DESIGN/design from merge2release/11.0 to release/11.0

* commit 'b57f7464952c18037130f8bc038ed44d505552d6':
  CHART-22211 甘特图用文件数据集日期显示异常
  REPORT-64811 保持设计器商城下载reu文件名中的版本信息
  REPORT-64741 【组件可更新提醒】组件复用-设计器端安装设计器版本高于当前设计器版本的组件的情况

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java

@@ -93,13 +93,13 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
         ganttDefinition.setEndTime(endTime == null ? StringUtils.EMPTY : String.valueOf(endTime));
 
         Object markTime = markerTimeComboBox.getSelectedItem();
-        ganttDefinition.setMarkTime(isNoneObject(markTime) ? StringUtils.EMPTY : String.valueOf(markTime));
+        ganttDefinition.setMarkTime(isNoneObject(markTime) ? null : String.valueOf(markTime));
 
         Object process = processComboBox.getSelectedItem();
-        ganttDefinition.setProgress(isNoneObject(process) ? StringUtils.EMPTY : String.valueOf(process));
+        ganttDefinition.setProgress(isNoneObject(process) ? null : String.valueOf(process));
 
         Object taskID = taskIDComboBox.getSelectedItem();
-        ganttDefinition.setLinkID(isNoneObject(taskID) ? StringUtils.EMPTY : String.valueOf(taskID));
+        ganttDefinition.setLinkID(isNoneObject(taskID) ? null : String.valueOf(taskID));
     }
 
     private boolean isNoneObject(Object markTime) {
@@ -117,9 +117,9 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
             seriesComboBox.setSelectedItem(ganttDefinition.getSeriesName());
             startTimeComboBox.setSelectedItem(ganttDefinition.getStartTime());
             endTimeComboBox.setSelectedItem(ganttDefinition.getEndTime());
-            markerTimeComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getMarkTime()) ? NONE : ganttDefinition.getMarkTime());
+            markerTimeComboBox.setSelectedItem(ganttDefinition.getMarkTime() == null ? NONE : ganttDefinition.getMarkTime());
-            processComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getProgress()) ? NONE : ganttDefinition.getProgress());
+            processComboBox.setSelectedItem(ganttDefinition.getProgress() == null ? NONE : ganttDefinition.getProgress());
-            taskIDComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getLinkID()) ? NONE : ganttDefinition.getLinkID());
+            taskIDComboBox.setSelectedItem(ganttDefinition.getLinkID() == null ? NONE : ganttDefinition.getLinkID());
         }
 
     }