解决冲突

src/main/resources/messages/message_en.properties

@@ -46,6 +46,11 @@ dns_monitor=dns monitor
 basic_configuration=basic configuration
 letter_from=letter from
 classification=classification
+classification_manage=classification_manage
+attribute_manage=attribute_manage
+area_manage=area_manage
+isp_manage=isp_manage
+feature_scope_manage=feature_scope_manage
 special_tasks=special tasks
 label_manage=label manage
 protect_list=protect list
@@ -132,6 +137,7 @@ begin_date=begin date
 end_date=end date
 delete=delete
 special_task=special task
+cancel_approved=cancel approved
 #============laihan end======================
 
 
@@ -152,6 +158,17 @@ turning_page=It is turning to the page
 login_timeout=No login or login timeout,please login again,Thank you!
 captcha_error=captcha error
 enter_captcha=Please enter the captcha
+input=please input
+input_title=please input title
+all_states=all states
+filter=filter
+to=to
+reset=reset
+info=info
+has_approved=It has been approved and can not be operated on !
+hasnot_approved=It has not been approved and can not be operated on !
+check_one=choose one please !
+one_more=please choose at least one !
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/resources/messages/message_zh_CN.properties

@@ -44,6 +44,11 @@ dns_monitor=DNS\u7ba1\u63a7
 basic_configuration=\u57fa\u672c\u914d\u7f6e
 letter_from=\u6765\u51fd\u5355\u4f4d
 classification=\u5206\u7c7b\u6027\u8d28
+classification_manage=\u5206\u7c7b\u7ba1\u7406
+attribute_manage=\u6027\u8d28\u7ba1\u7406
+area_manage=\u5730\u57df\u7ba1\u7406
+isp_manage=\u8fd0\u8425\u5546\u7ba1\u7406
+feature_scope_manage=\u7279\u5f81\u4f5c\u7528\u57df\u7ba1\u7406
 special_tasks=\u4e13\u9879\u4efb\u52a1
 label_manage=\u6807\u7b7e\u7ba1\u7406
 protect_list=\u4fdd\u62a4\u540d\u5355
@@ -132,6 +137,7 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
 special_task=\u4e13\u9879\u4efb\u52a1
+cancel_approved=\u914d\u7f6e\u53d6\u6d88
 #==========laihan end=====================
 
 #==========message begin=====================
@@ -151,6 +157,17 @@ turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
 login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22!
 captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
 enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
+input=\u8bf7\u8f93\u5165
+input_title=\u8bf7\u8f93\u5165\u6807\u9898
+all_states=\u6240\u6709\u72b6\u6001
+filter=\u7b5b\u9009
+to=\u5230
+reset=\u91cd\u7f6e
+info=\u63d0\u793a
+has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
+one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================