Merge remote-tracking branch 'origin/liuna'

src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp

@@ -39,8 +39,8 @@
             <td>${qualityRuleInfo.kpiCode}</td>
             <td>${qualityRuleInfo.warningType}</td>
             <td>${qualityRuleInfo.warningReason}</td>
-            <td><fmt:formatDate value="${qualityRuleInfo.businessTime}" pattern="yyyy-MM-dd hh:mm" /></td>
-            <td><fmt:formatDate value="${qualityRuleInfo.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm" /></td>
+            <td>${qualityRuleInfo.businessTime}</td>
+            <td>${qualityRuleInfo.kpiMonitorRunTime}</td>
             <td><a href='javascript:;' onclick='selectRule(${qualityRuleInfo.qualityRuleId})'>查看规则</a></td>
                 <%--<td>--%>
                 <%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">无过滤规则</c:if>--%>