From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/ActionUtil.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/ActionUtil.java b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
index e1ae3c5..b9bface 100644
--- a/gx_tieta/src/com/fgkj/actions/ActionUtil.java
+++ b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
@@ -33,6 +33,8 @@
 public class ActionUtil extends ActionSupport{
 	public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss";
 	
+	
+	
 	/*
 	 * 鑾峰彇HttpServletRequest
 	 */

--
Gitblit v1.9.1