From dd0133b2d2781a6fcef27454cb4075900e3636b3 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Tue, 2 Jul 2019 16:05:40 +0800
Subject: [PATCH] =?UTF-8?q?mail=E6=9C=80=E5=A4=9A7=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=A1=A5=E5=85=85=EF=BC=9B=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E8=AF=B7=E8=87=B3=E5=B0=91=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E4=B8=AD=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_zh_CN.properties | 2 +-
 src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index e94372d23..4c207d324 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1642,7 +1642,7 @@ obj_group_configuration=\u5BF9\u8C61\u7EC4\u7BA1\u7406
 domain_group=\u57DF\u540D\u7EC4
 url_group=URL\u7EC4
 subscribe_id_group=\u8D26\u53F7\u7EC4
-at_least_one_group=\u8FB7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EC4
+at_least_one_group=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EC4
 most_seven_group=\u81F3\u591A\u53EF\u9009\u62E9\u0037\u4E2A\u7EC4
 most_eight_group=\u81F3\u591A\u53EF\u9009\u62E9\u0038\u4E2A\u7EC4
 no_common_group=ID\u4E3A%s\u7684\u914D\u7F6E\u7F3A\u5C11\u7EC4
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
index 3967797ea..1c3c76c0d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -167,7 +167,7 @@ $(function(){
 				top.$.jBox.tip("<spring:message code='at_least_one_group'/>", "<spring:message code='info'/>");
 				return;
 			}else{
-				if($("[name='userRegion1']").val()=="http"&&ipGroupLen>0){
+				if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail")&&ipGroupLen>0){
 					if(grouplen>7){
 						top.$.jBox.tip("<spring:message code='most_seven_group'/>", "<spring:message code='info'/>");
 						return;