Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

src/res/formattext.json

@@ -77,7 +77,7 @@
             "desc": ""
 		},
 		{
-			"reg": "([^(（,，。、.;；:：\r\n]{0,8})(联系人|地址)[:：]([^\\s\u3000\u2003\u00a0，,]+?)(联系)?(电话(/传真)?|手机|传真|邮编)[:：](.+)",
+			"reg": "([^(（,，。、.;；:：\r\n公司]{0,8})(联系人|地址)[:：]([^\\s\u3000\u2003\u00a0，,]+?)(联系)?(电话(/传真)?|手机|传真|邮编)[:：](.+)",
             "separator": "\n${1}${2}：${3}\n${1}${5}：${7}",
             "desc": ""
 		},