融合代码 提交本地

src/main/resources/messages/message_en.properties

@@ -147,8 +147,7 @@ desc=description
 parent_id=parentid
 is_leaf=whether leaf node
 is_valid=whether valid
-create_time=createtime
-edit_time=edittime
+create_time=create time
 superior_config=superior configuration
 config_content=configuration content
 root_node=root node
@@ -156,7 +155,7 @@ leafChange=this configuration includes subnode,cannot be leaf node
 typeChild=this data type will be not same with subnode
 typeSame=please select the consistent upper and lower data types
 isLevelNoSure=more than the maximum level
-is_repeat=field content is repeat 
+is_repeat=content is repeat 
 submitting=submitting
 #============yewu end======================
 
@@ -304,7 +303,6 @@ audit_time=audit time
 yes=yes
 no=no
 deleted=deleted
-cancel_approved=cancel approved
 
 #==========youjianguankong end=====================
 

src/main/resources/messages/message_ru.properties

@@ -156,7 +156,7 @@ leafChange=this configuration includes subnode,cannot be leaf node
 typeChild=this data type will be not same with subnode
 typeSame=please select the consistent upper and lower data types
 isLevelNoSure=more than the maximum level
-is_repeat=field content is repeat 
+is_repeat=content is repeat 
 submitting=submitting
 #============yewu end======================
 

src/main/resources/messages/message_zh_CN.properties

@@ -19,6 +19,7 @@ show=\u67e5\u770b
 edit=\u4fee\u6539
 hi=\u4f60\u597d
 exit=\u9000\u51fa
+choose=\u9009\u62e9
 
 #==========menu begin=====================
 requestInfo=\u6765\u51fd\u4fe1\u606f
@@ -138,7 +139,6 @@ parent_id=\u7236ID
 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
 is_valid=\u6709\u6548\u6807\u5fd7
 create_time=\u521b\u5efa\u65f6\u95f4
-edit_time=\u4fee\u6539\u65f6\u95f4
 superior_config=\u4e0a\u7ea7\u914d\u7f6e
 config_content=\u914d\u7f6e\u5185\u5bb9
 root_node=\u6839\u8282\u70b9
@@ -174,7 +174,6 @@ 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
 task_name=\u4e13\u9879\u540d\u79f0
 task_org=\u62a5\u9001\u5355\u4f4d
 task_time=\u62a5\u9001\u65f6\u95f4