Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-07-12 15:52:34 +08:00
parent 101837514f 3d954f1fca
commit a5f9ee791f
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -655,6 +655,6 @@ public class MaatCfg implements Serializable {
 		this.endTime=DateUtils.addYears(this.startTime, 2099-Integer.parseInt(DateUtils.getYear()));
 		this.fatherCfgId=0;
 		//初始化用户定义域占位符，对用户定义域有特殊格式的业务，根据分隔符拆分占位符，在相应位置填写相应参数值
-		this.userRegion = Constants.USER_REGION_PLACEHOLDER;
+//		this.userRegion = Constants.USER_REGION_PLACEHOLDER;
 	}
 }