Merge remote-tracking branch 'origin/feature-cache' into feature-refactor

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowHistogramService.java

@@ -107,6 +107,7 @@ public class ShowHistogramService {
             chartsDataInfo.setChartsColumnConfig(chartsColumnConfig);
             if ("time".equals(xColumnType)) {
                 xColumn = TimeConverterUtil.convertToOracleDateStr(xColumn, xAxisType);
+                sort = xColumn;
             }
             //Y轴排序
             if (sort.equals(yColumn)) {