Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Public/Admin/css/style.css

@@ -2176,7 +2176,7 @@ input:-webkit-autofill {
 }
 /*input输入框 placeholder 颜色*/
 
-.page .current {border-left:1px solid #CCCCCC;}
+.page .current {border-left:1px solid #CCCCCC;border-right: 1px solid #CCCCCC;}
 .page select {height:30px;float:left;/* margin-right:15px; */}
 .page select+a,.page select+.current {margin-left:15px;}
 .page .rows {padding-left:0;}