Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects/src/main/java/com/rtrh/projects/web/controller/passport/LogoutController.java

@@ -28,7 +28,7 @@ public class LogoutController {
 		//重定向到首页
 		// return new ModelAndView("redirect:/");
 		ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
-		String url = resourceBundle.getString("app.fgw.in.url");
+		String url = resourceBundle.getString("app.fgw.out.url");
 		return new ModelAndView("redirect:"+url);
 	}
 }

projects/src/main/webapp/vmodules/statics/layer/projInfo_new.jsp

@@ -206,7 +206,7 @@
                     </div>
                 </div>
                 <table id="table1" lay-filter="test"></table>
-                <div id="pagination" class="pagination"></div>
+                <div id="pagination" class="pagination txt_white"></div>
             </div>
         </div>
     </div>