Merge branch 'master' of

http://tolag3@vcs.iten.co.kr:9999/hylee/mjon_git into master_tolag3

글로벌 프로퍼티 원복

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -28,8 +28,8 @@ Globals.Env = local
 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-#Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
-Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
+Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
+#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$
 #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon