Merge remote-tracking branch 'origin/master'

# Conflicts:
#	simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ClusterService.java

api-common/src/main/java/api/common/pojo/vo/system/ClusterVO.java

@@ -22,6 +22,7 @@ public class ClusterVO {
     private int validNumSimLicense;        // 有效的仿真软件license数量-编辑页面
     private int validNumDynLicense;        // 有效的动力学软件license数量-编辑页面
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date modifyTime;        // 操作时间
 
 }