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

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties

src/main/resources/messages/message_en.properties

@@ -1109,4 +1109,4 @@ pxy_intercept_monit_keyring=Certificate Strategy
 intercept_file_strategy=Intercept Certificate Strategy
 root=Root Certificate
 intermediate=Intermediate Certificate
-end_entity=End-entity Certificate
+end_entity=End-entity Certificate

src/main/resources/messages/message_zh_CN.properties

@@ -1105,4 +1105,4 @@ pxy_intercept_monit_keyring=\u8BC1\u4E66\u7B56\u7565
 intercept_file_strategy=\u62E6\u622A\u8BC1\u4E66\u7B56\u7565
 root=\u6839\u8BC1\u4E66
 intermediate=\u4E2D\u95F4\u8BC1\u4E66
-end_entity=\u5B9E\u4F53\u8BC1\u4E66
+end_entity=\u5B9E\u4F53\u8BC1\u4E66

src/main/resources/nis.properties

@@ -461,4 +461,7 @@ maat_cfg_dolog_configpercent_default=100
 maat_cfg_dolog_configoption_default=1
 #app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26
 app_cfg_userregion_splitor=&
-app_id_region=APP_ID
+app_id_region=APP_ID
+#application spec service code scope
+app_spec_service_code_max_val=310000
+app_spec_service_code_min_val=300001

src/main/resources/sql/add_spec_add_flag.sql

@@ -0,0 +1 @@
+ALTER TABLE specific_service_cfg ADD  add_flag INT(11) NULL COMMENT '添加标记，APP特征界面上添加的为用户自己添加的';