From 170870229385229aa95aa59fa0e4a811d747147f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.30>
Date: 星期五, 16 十一月 2018 11:21:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ActionUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ActionUtil.java b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
index d3193d6..86367a7 100644
--- a/gx_tieta/src/com/fgkj/actions/ActionUtil.java
+++ b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
@@ -33,7 +33,7 @@
public class ActionUtil extends ActionSupport{
public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss";
- public final static String CROSS_DOMAIN_KEY = "44c4a294cb66d13727c14b065dbe8548"; //璺ㄥ煙璇锋眰 key
+
public String key; //璺ㄥ煙璇嗗埆鐮�
--
Gitblit v1.9.1