Merge remote-tracking branch 'origin/develop' into develop

WebContent/jfcas04/css/common.css

@@ -1119,6 +1119,10 @@ a{
 	line-height: 34px;
 	margin-top:5px;
 	cursor: pointer;
+	white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+   	width: 311px;
 }
 .disk_content_list_fileName>div:first-child+div>div:hover{
 	color:#2CA4F0;
@@ -1520,7 +1524,7 @@ a{
 }
 .disk_selectUser_content>div{
 	padding:0;
-	height:600px;
+	height:580px;
 }
 .disk_selectUser_content>div:first-child{
 	border-right:1px solid #e5e5e5;